From de86403f330e68df8fc4aee00df98374b7842d0d Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Fri, 6 Mar 2015 12:18:44 +0100
Subject: cmd/ethereum: fix JS REPL exit and add support for dumb terminals

It is now possible to exit the REPL using Ctrl-C, Ctrl-D or by typing "exit".
---
 cmd/ethereum/main.go | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'cmd/ethereum/main.go')

diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index c85caf229..1133bd6f7 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -125,7 +125,6 @@ runtime will execute the file and exit.
 func main() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
 	defer logger.Flush()
-	utils.HandleInterrupt()
 	if err := app.Run(os.Args); err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
@@ -134,6 +133,7 @@ func main() {
 
 func run(ctx *cli.Context) {
 	fmt.Printf("Welcome to the FRONTIER\n")
+	utils.HandleInterrupt()
 	eth := utils.GetEthereum(ClientIdentifier, Version, ctx)
 	startEth(ctx, eth)
 	// this blocks the thread
@@ -144,9 +144,8 @@ func runjs(ctx *cli.Context) {
 	eth := utils.GetEthereum(ClientIdentifier, Version, ctx)
 	startEth(ctx, eth)
 	if len(ctx.Args()) == 0 {
-		repl := newREPL(eth)
-		utils.RegisterInterrupt(func(os.Signal) { repl.Stop() })
-		repl.Start()
+		runREPL(eth)
+		eth.Stop()
 		eth.WaitForShutdown()
 	} else if len(ctx.Args()) == 1 {
 		execJsFile(eth, ctx.Args()[0])
-- 
cgit