respect ForceColor and environment variables over OS check

This commit is contained in:
Ceriath
2018-12-09 21:47:44 +01:00
parent f1b98e4006
commit d962013756
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -91,7 +91,7 @@ func (f *TextFormatter) init(entry *Entry) {
}
func (f *TextFormatter) isColored() bool {
isColored := f.ForceColors || f.isTerminal
isColored := f.ForceColors || (f.isTerminal && (runtime.GOOS != "windows"))
if f.EnvironmentOverrideColors {
if force, ok := os.LookupEnv("CLICOLOR_FORCE"); ok && force != "0" {
@@ -103,7 +103,7 @@ func (f *TextFormatter) isColored() bool {
}
}
return isColored && !f.DisableColors && (runtime.GOOS != "windows")
return isColored && !f.DisableColors
}
// Format renders a single log entry