Don't use aec when NO_COLOR is defined

Signed-off-by: Sean P. Kane <spkane00@gmail.com>
moby · Jul 19, 2022 · fed245f · fed245f
1 parent 268afb4
commit fed245f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/util/progress/progressui/display.go b/util/progress/progressui/display.go
@@ -830,7 +830,9 @@ func (disp *display) print(d displayInfo, width, height int, all bool) {
 			} else if j.hasError {
 				color = colorError
 			}
-			out = aec.Apply(out, color)
+			if color != nil {
+				out = aec.Apply(out, color)
+			}
 		}
 		fmt.Fprint(disp.c, out)
 		lineCount++

diff --git a/util/progress/progressui/init.go b/util/progress/progressui/init.go
@@ -15,10 +15,10 @@ var colorError aec.ANSI
 func init() {
 	// As recommended on https://no-color.org/
 	if _, ok := os.LookupEnv("NO_COLOR"); ok {
-		colorRun = termColorMap["default"]
-		colorCancel = termColorMap["default"]
-		colorWarning = termColorMap["default"]
-		colorError = termColorMap["default"]
+		colorRun = nil
+		colorCancel = nil
+		colorWarning = nil
+		colorError = nil
 		return
 	} else if runtime.GOOS == "windows" {
 		colorRun = termColorMap["cyan"]