commands: Only show Ansi escape codes if in a terminal

gohugoio · Oct 26, 2018 · df02131 · df02131
1 parent 7857863
commit df02131
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 50 deletions.
diff --git a/commands/helpers.go b/commands/helpers.go
@@ -23,6 +23,13 @@ import (
 	"github.com/spf13/cobra"
 )
 
+const (
+	ansiEsc    = "\u001B"
+	clearLine  = "\r\033[K"
+	hideCursor = ansiEsc + "[?25l"
+	showCursor = ansiEsc + "[?25h"
+)
+
 type flagsToConfigHandler interface {
 	flagsToConfig(cfg config.Provider)
 }

diff --git a/commands/helpers_others.go b/commands/helpers_others.go
diff --git a/commands/helpers_windows.go b/commands/helpers_windows.go
diff --git a/commands/hugo.go b/commands/hugo.go
@@ -27,6 +27,7 @@ import (
 
 	"github.com/gohugoio/hugo/common/herrors"
 	"github.com/gohugoio/hugo/common/loggers"
+	"github.com/gohugoio/hugo/common/terminal"
 
 	"syscall"
 
@@ -264,17 +265,30 @@ func setValueFromFlag(flags *flag.FlagSet, key string, cfg config.Provider, targ
 	}
 }
 
+func isTerminal() bool {
+	return terminal.IsTerminal(os.Stdout)
+
+}
+func ifTerminal(s string) string {
+	if !isTerminal() {
+		return ""
+	}
+	return s
+}
+
 func (c *commandeer) fullBuild() error {
 	var (
 		g         errgroup.Group
 		langCount map[string]uint64
 	)
 
 	if !c.h.quiet {
-		fmt.Print(hideCursor + "Building sites … ")
-		defer func() {
-			fmt.Print(showCursor + clearLine)
-		}()
+		fmt.Print(ifTerminal(hideCursor) + "Building sites … ")
+		if isTerminal() {
+			defer func() {
+				fmt.Print(showCursor + clearLine)
+			}()
+		}
 	}
 
 	copyStaticFunc := func() error {