forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-24 21:56:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 86851a7192 into b9aedeab0b

Browse source
This commit is contained in:
bas-vk 2015-12-15 10:57:44 +00:00
commit 64f25c967a
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cmd/geth/js.go
View file

@ -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() { func (self *jsre) interactive() {
// Read input lines. // Read input lines.
prompt := make(chan string) prompt := make(chan string)

5
cmd/geth/main.go
View file

@ -461,7 +461,10 @@ func execScripts(ctx *cli.Context) {
client, false, nil) client, false, nil)
for _, file := range ctx.Args() { 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() node.Stop()
} }