From c750ef09e1571fbdb36d408ff894ed2bbcc80014 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Tue, 5 May 2015 13:24:15 +0300
Subject: cmd/geth: fix #853 colorize console output in windows
---
cmd/geth/main.go | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
(limited to 'cmd/geth')
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index 0f5ebf5be..e00b139c0 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -23,14 +23,14 @@ package main
import (
"bufio"
"fmt"
+ "io"
"io/ioutil"
"os"
+ "path"
"runtime"
"strconv"
"time"
- "path"
-
"github.com/codegangsta/cli"
"github.com/ethereum/ethash"
"github.com/ethereum/go-ethereum/accounts"
@@ -41,6 +41,8 @@ import (
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/eth"
"github.com/ethereum/go-ethereum/logger"
+ "github.com/mattn/go-colorable"
+ "github.com/mattn/go-isatty"
"github.com/peterh/liner"
)
import _ "net/http/pprof"
@@ -301,6 +303,14 @@ func run(ctx *cli.Context) {
}
func console(ctx *cli.Context) {
+ // Wrap the standard output with a colorified stream (windows)
+ if isatty.IsTerminal(os.Stdout.Fd()) {
+ if pr, pw, err := os.Pipe(); err == nil {
+ go io.Copy(colorable.NewColorableStdout(), pr)
+ os.Stdout = pw
+ }
+ }
+
cfg := utils.MakeEthConfig(ClientIdentifier, nodeNameVersion, ctx)
ethereum, err := eth.New(cfg)
if err != nil {
--
cgit v1.2.3