From 44eb69561a32c1b1e5345b5872e7de69fff936c2 Mon Sep 17 00:00:00 2001 From: HackyMiner Date: Sat, 29 Sep 2018 23:15:39 +0900 Subject: 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 --- internal/debug/flags.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'internal/debug') diff --git a/internal/debug/flags.go b/internal/debug/flags.go index 7d7eba98a..46c8fe9f8 100644 --- 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() -- cgit