diff --git a/cmd/geth/js.go b/cmd/geth/js.go index 56b7a8b001..b3cfdfab5f 100644 --- a/cmd/geth/js.go +++ b/cmd/geth/js.go @@ -394,15 +394,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 f2bb275520..1bcb23dac3 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -461,7 +461,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() }