diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-08-14 19:14:11 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-08-14 19:14:11 +0800 |
| commit | 3a66c4ed477cde437705f02811225fa11b0ae5ff (patch) | |
| tree | 4fb74e85fc85ad9cf532d6f0b24e31a821c15fa7 /cmd/geth/main.go | |
| parent | 29181003d4f50611a9082805509eed425c81db1a (diff) | |
| parent | 0ef80bb3d05ecb44297d25c889a85555bc55ef0c (diff) | |
| download | dexon-3a66c4ed477cde437705f02811225fa11b0ae5ff.tar dexon-3a66c4ed477cde437705f02811225fa11b0ae5ff.tar.gz dexon-3a66c4ed477cde437705f02811225fa11b0ae5ff.tar.bz2 dexon-3a66c4ed477cde437705f02811225fa11b0ae5ff.tar.lz dexon-3a66c4ed477cde437705f02811225fa11b0ae5ff.tar.xz dexon-3a66c4ed477cde437705f02811225fa11b0ae5ff.tar.zst dexon-3a66c4ed477cde437705f02811225fa11b0ae5ff.zip | |
Merge pull request #1642 from ethereum/fix-js-console-windows
cmd/geth, jsre: restore command line editing on windows
Diffstat (limited to 'cmd/geth/main.go')
| -rw-r--r-- | cmd/geth/main.go | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index d5391801d..2dc3c438f 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -19,7 +19,6 @@ package main import ( "fmt" - "io" "io/ioutil" _ "net/http/pprof" "os" @@ -46,8 +45,6 @@ import ( "github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rpc/codec" "github.com/ethereum/go-ethereum/rpc/comms" - "github.com/mattn/go-colorable" - "github.com/mattn/go-isatty" ) const ( @@ -398,14 +395,6 @@ func run(ctx *cli.Context) { func attach(ctx *cli.Context) { utils.CheckLegalese(ctx.GlobalString(utils.DataDirFlag.Name)) - // 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 - } - } - var client comms.EthereumClient var err error if ctx.Args().Present() { @@ -438,14 +427,6 @@ func attach(ctx *cli.Context) { func console(ctx *cli.Context) { utils.CheckLegalese(ctx.GlobalString(utils.DataDirFlag.Name)) - // 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 { |