From fed245fb00b142a9dc58ca7f6d03ce6ffc8ee3dc Mon Sep 17 00:00:00 2001 From: "Sean P. Kane" Date: Tue, 19 Jul 2022 14:15:17 -0700 Subject: [PATCH] Don't use aec when NO_COLOR is defined Signed-off-by: Sean P. Kane --- util/progress/progressui/display.go | 4 +++- util/progress/progressui/init.go | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/util/progress/progressui/display.go b/util/progress/progressui/display.go index 2d4ccd153e2d9..2235b7f9a28fc 100644 --- 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 index 8662d753369a1..d6c6e78085f4b 100644 --- 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"]