summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2022-06-13 15:28:08 +0200
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2022-06-13 18:07:37 +0200
commitcbc35c48d252a1b44e4c30e26cfba2ff462a1f96 (patch)
tree845625eeb385601adce511f0ce972a8cb0347698
parent44f3c079691f58e31bed31333afed3b7bf3b794f (diff)
Respect NO_COLOR
Fixes #10004
-rw-r--r--commands/hugo.go6
-rw-r--r--common/loggers/loggers.go2
-rw-r--r--common/terminal/colors.go11
-rw-r--r--common/text/position.go2
4 files changed, 13 insertions, 8 deletions
diff --git a/commands/hugo.go b/commands/hugo.go
index f10fec00b..5169d65a5 100644
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -284,10 +284,6 @@ func setValueFromFlag(flags *flag.FlagSet, key string, cfg config.Provider, targ
}
}
-func isTerminal() bool {
- return terminal.IsTerminal(os.Stdout)
-}
-
func (c *commandeer) fullBuild(noBuildLock bool) error {
var (
g errgroup.Group
@@ -297,7 +293,7 @@ func (c *commandeer) fullBuild(noBuildLock bool) error {
if !c.h.quiet {
fmt.Println("Start building sites … ")
fmt.Println(hugo.BuildVersionString())
- if isTerminal() {
+ if terminal.IsTerminal(os.Stdout) {
defer func() {
fmt.Print(showCursor + clearLine)
}()
diff --git a/common/loggers/loggers.go b/common/loggers/loggers.go
index c61c55a67..308635fe9 100644
--- a/common/loggers/loggers.go
+++ b/common/loggers/loggers.go
@@ -290,7 +290,7 @@ func InitGlobalLogger(stdoutThreshold, logThreshold jww.Threshold, outHandle, lo
}
func getLogWriters(outHandle, logHandle io.Writer) (io.Writer, io.Writer) {
- isTerm := terminal.IsTerminal(os.Stdout)
+ isTerm := terminal.PrintANSIColors(os.Stdout)
if logHandle != ioutil.Discard && isTerm {
// Remove any Ansi coloring from log output
logHandle = ansiCleaner{w: logHandle}
diff --git a/common/terminal/colors.go b/common/terminal/colors.go
index 334b82fae..c4a78291e 100644
--- a/common/terminal/colors.go
+++ b/common/terminal/colors.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The Hugo Authors. All rights reserved.
+// Copyright 2022 The Hugo Authors. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -29,6 +29,15 @@ const (
noticeColor = "\033[1;36m%s\033[0m"
)
+// PrintANSIColors returns false if NO_COLOR env variable is set,
+// else IsTerminal(f).
+func PrintANSIColors(f *os.File) bool {
+ if os.Getenv("NO_COLOR") != "" {
+ return false
+ }
+ return IsTerminal(f)
+}
+
// IsTerminal return true if the file descriptor is terminal and the TERM
// environment variable isn't a dumb one.
func IsTerminal(f *os.File) bool {
diff --git a/common/text/position.go b/common/text/position.go
index 34e856c5d..cc1eda354 100644
--- a/common/text/position.go
+++ b/common/text/position.go
@@ -83,7 +83,7 @@ func createPositionStringFormatter(formatStr string) func(p Position) string {
msg := fmt.Sprintf(format, args...)
- if terminal.IsTerminal(os.Stdout) {
+ if terminal.PrintANSIColors(os.Stdout) {
return terminal.Notice(msg)
}