From eb968b65069b7b415d83ba5a6451718d3f93763e Mon Sep 17 00:00:00 2001
From: David Bariod <davidriod@googlemail.com>
Date: Thu, 9 Aug 2018 15:00:46 +0200
Subject: [PATCH] Fix for CLICOLOR_FORCE handling

---
 text_formatter.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/text_formatter.go b/text_formatter.go
index cdf3185..beb628f 100644
--- a/text_formatter.go
+++ b/text_formatter.go
@@ -37,7 +37,7 @@ type TextFormatter struct {
 	DisableColors bool
 
 	// Override coloring based on CLICOLOR and CLICOLOR_FORCE. - https://bixense.com/clicolors/
-	OverrideColors bool
+	EnvironmentOverrideColors bool
 
 	// Disable timestamp logging. useful when output is redirected to logging
 	// system that already adds timestamps.
@@ -85,12 +85,12 @@ func (f *TextFormatter) init(entry *Entry) {
 func (f *TextFormatter) isColored() bool {
 	isColored := f.ForceColors || f.isTerminal
 
-	if f.OverrideColors {
+	if f.EnvironmentOverrideColors {
 		if force, ok := os.LookupEnv("CLICOLOR_FORCE"); ok && force != "0" {
 			isColored = true
-		}
-
-		if os.Getenv("CLICOLOR") == "0" {
+		} else if ok && force == "0" {
+			isColored = false
+		} else if os.Getenv("CLICOLOR") == "0" {
 			isColored = false
 		}
 	}