Merge pull request cli#1187 from gabgodBB/Disabling_color_for_output_file

mislav · web-flow · commit 15a7ab6b92ec · 2020-06-24T17:18:22.000+02:00
Issue cli#930 - Removing color for output files
diff --git a/utils/color.go b/utils/color.go
@@ -10,8 +10,7 @@ import (
 )
 
 var (
-	_isColorEnabled                                    bool = true
-	_isStdoutTerminal, checkedTerminal, checkedNoColor bool
+	_isStdoutTerminal, checkedTerminal bool
 
 	// Outputs ANSI color if stdout is a tty
 	Magenta = makeColorFunc("magenta")
@@ -45,17 +44,17 @@ func NewColorable(f *os.File) io.Writer {
 func makeColorFunc(color string) func(string) string {
 	cf := ansi.ColorFunc(color)
 	return func(arg string) string {
-		if isColorEnabled() && isStdoutTerminal() {
+		if isColorEnabled() {
 			return cf(arg)
 		}
 		return arg
 	}
 }
 
 func isColorEnabled() bool {
-	if !checkedNoColor {
-		_isColorEnabled = os.Getenv("NO_COLOR") == ""
-		checkedNoColor = true
+	if os.Getenv("NO_COLOR") != "" {
+		return false
 	}
-	return _isColorEnabled
+
+	return isStdoutTerminal()
 }

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,7 @@ import (`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`var (`
`13`		`- _isColorEnabled bool = true`
`14`		`- _isStdoutTerminal, checkedTerminal, checkedNoColor bool`
	`13`	`+ _isStdoutTerminal, checkedTerminal bool`
`15`	`14`
`16`	`15`	`// Outputs ANSI color if stdout is a tty`
`17`	`16`	`Magenta = makeColorFunc("magenta")`
`@@ -45,17 +44,17 @@ func NewColorable(f *os.File) io.Writer {`
`45`	`44`	`func makeColorFunc(color string) func(string) string {`
`46`	`45`	`cf := ansi.ColorFunc(color)`
`47`	`46`	`return func(arg string) string {`
`48`		`- if isColorEnabled() && isStdoutTerminal() {`
	`47`	`+ if isColorEnabled() {`
`49`	`48`	`return cf(arg)`
`50`	`49`	`}`
`51`	`50`	`return arg`
`52`	`51`	`}`
`53`	`52`	`}`
`54`	`53`
`55`	`54`	`func isColorEnabled() bool {`
`56`		`- if !checkedNoColor {`
`57`		`- _isColorEnabled = os.Getenv("NO_COLOR") == ""`
`58`		`- checkedNoColor = true`
	`55`	`+ if os.Getenv("NO_COLOR") != "" {`
	`56`	`+ return false`
`59`	`57`	`}`
`60`		`- return _isColorEnabled`
	`58`	`+`
	`59`	`+ return isStdoutTerminal()`
`61`	`60`	`}`