From 86851a719207f2379864e7e96ccbaa691d0adb21 Mon Sep 17 00:00:00 2001
From: Bas van Kervel <bas@ethdev.com>
Date: Fri, 11 Dec 2015 11:41:07 +0100
Subject: [PATCH] geth/js: bugfix, geth would not stop after the js subcommand

---
 cmd/geth/js.go   | 9 ---------
 cmd/geth/main.go | 5 ++++-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/cmd/geth/js.go b/cmd/geth/js.go
index 843c9a5b57..98282a81b7 100644
--- a/cmd/geth/js.go
+++ b/cmd/geth/js.go
@@ -378,15 +378,6 @@ func (self *jsre) UnlockAccount(addr []byte) bool {
 	}
 }
 
-func (self *jsre) exec(filename string) error {
-	if err := self.re.Exec(filename); err != nil {
-		self.re.Stop(false)
-		return fmt.Errorf("Javascript Error: %v", err)
-	}
-	self.re.Stop(true)
-	return nil
-}
-
 func (self *jsre) interactive() {
 	// Read input lines.
 	prompt := make(chan string)
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index 8798bbb273..d14d14e3fa 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -460,7 +460,10 @@ func execScripts(ctx *cli.Context) {
 		client, false, nil)
 
 	for _, file := range ctx.Args() {
-		repl.exec(file)
+		if err := repl.re.Exec(file); err != nil {
+			fmt.Errorf("Javascript Error: %v", err)
+			break
+		}
 	}
 	node.Stop()
 }