internal/debug: support color terminal for cygwin/msys2 (ethereum#17740)

gzliudan · Nov 15, 2024 · 7865057 · 7865057
1 parent 49e889e
commit 7865057
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 150 deletions.
diff --git a/internal/debug/flags.go b/internal/debug/flags.go
@@ -25,10 +25,10 @@ import (
 	"runtime"
 
 	"github.com/XinFinOrg/XDPoSChain/log"
-	"github.com/XinFinOrg/XDPoSChain/log/term"
 	"github.com/XinFinOrg/XDPoSChain/metrics"
 	"github.com/XinFinOrg/XDPoSChain/metrics/exp"
 	colorable "github.com/mattn/go-colorable"
+	"github.com/mattn/go-isatty"
 	"gopkg.in/urfave/cli.v1"
 )
 
@@ -113,7 +113,7 @@ var Flags = []cli.Flag{
 var Glogger *log.GlogHandler
 
 func init() {
-	usecolor := term.IsTty(os.Stderr.Fd()) && os.Getenv("TERM") != "dumb"
+	usecolor := (isatty.IsTerminal(os.Stderr.Fd()) || isatty.IsCygwinTerminal(os.Stderr.Fd())) && os.Getenv("TERM") != "dumb"
 	output := io.Writer(os.Stderr)
 	if usecolor {
 		output = colorable.NewColorableStderr()

diff --git a/log/term/LICENSE b/log/term/LICENSE
diff --git a/log/term/terminal_appengine.go b/log/term/terminal_appengine.go
diff --git a/log/term/terminal_darwin.go b/log/term/terminal_darwin.go
diff --git a/log/term/terminal_freebsd.go b/log/term/terminal_freebsd.go
diff --git a/log/term/terminal_linux.go b/log/term/terminal_linux.go
diff --git a/log/term/terminal_netbsd.go b/log/term/terminal_netbsd.go
diff --git a/log/term/terminal_notwindows.go b/log/term/terminal_notwindows.go
diff --git a/log/term/terminal_openbsd.go b/log/term/terminal_openbsd.go
diff --git a/log/term/terminal_solaris.go b/log/term/terminal_solaris.go
diff --git a/log/term/terminal_windows.go b/log/term/terminal_windows.go