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

- update go-colorable, go-isatty, go-runewidth packages - use go-isatty instead of log/term and remove log/term package
ethereum · Sep 29, 2018 · 44eb695 · 44eb695
1 parent d9e324a
commit 44eb695
Show file tree

Hide file tree

Showing 23 changed files with 326 additions and 296 deletions.
diff --git a/internal/debug/flags.go b/internal/debug/flags.go
@@ -25,11 +25,11 @@ import (
 	"runtime"
 
 	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/log/term"
 	"github.com/ethereum/go-ethereum/metrics"
 	"github.com/ethereum/go-ethereum/metrics/exp"
 	"github.com/fjl/memsize/memsizeui"
 	colorable "github.com/mattn/go-colorable"
+	"github.com/mattn/go-isatty"
 	"gopkg.in/urfave/cli.v1"
 )
 
@@ -101,7 +101,7 @@ var (
 )
 
 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
diff --git a/vendor/github.com/mattn/go-colorable/README.md b/vendor/github.com/mattn/go-colorable/README.md
diff --git a/vendor/github.com/mattn/go-colorable/colorable_others.go b/vendor/github.com/mattn/go-colorable/colorable_others.go