diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-04-12 17:00:42 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-04-12 17:00:42 +0800 |
| commit | 934f587bd5c38a36e8b8c8647a9e600d1751ff2f (patch) | |
| tree | 342555f160d5141b9e4a44d0d4504edb0337dce8 /cmd/geth/main.go | |
| parent | e456451a89042fd477f8c05de25a1a1265e4b65b (diff) | |
| parent | 3c5329599c6a07176fb80848f8592c5f90944a31 (diff) | |
| download | dexon-934f587bd5c38a36e8b8c8647a9e600d1751ff2f.tar dexon-934f587bd5c38a36e8b8c8647a9e600d1751ff2f.tar.gz dexon-934f587bd5c38a36e8b8c8647a9e600d1751ff2f.tar.bz2 dexon-934f587bd5c38a36e8b8c8647a9e600d1751ff2f.tar.lz dexon-934f587bd5c38a36e8b8c8647a9e600d1751ff2f.tar.xz dexon-934f587bd5c38a36e8b8c8647a9e600d1751ff2f.tar.zst dexon-934f587bd5c38a36e8b8c8647a9e600d1751ff2f.zip | |
Merge pull request #2431 from bas-vk/js-preload
cmd/geth: add JS preload parameter
Diffstat (limited to 'cmd/geth/main.go')
| -rw-r--r-- | cmd/geth/main.go | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 645743c13..c0a7ba318 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -331,6 +331,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso utils.IPCApiFlag, utils.IPCPathFlag, utils.ExecFlag, + utils.PreLoadJSFlag, utils.WhisperEnabledFlag, utils.DevModeFlag, utils.TestNetFlag, @@ -427,6 +428,13 @@ func attach(ctx *cli.Context) { true, ) + // preload user defined JS files into the console + err = repl.preloadJSFiles(ctx) + if err != nil { + utils.Fatalf("unable to preload JS file %v", err) + } + + // in case the exec flag holds a JS statement execute it and return if ctx.GlobalString(utils.ExecFlag.Name) != "" { repl.batch(ctx.GlobalString(utils.ExecFlag.Name)) } else { @@ -477,6 +485,13 @@ func console(ctx *cli.Context) { ctx.GlobalString(utils.RPCCORSDomainFlag.Name), client, true) + // preload user defined JS files into the console + err = repl.preloadJSFiles(ctx) + if err != nil { + utils.Fatalf("unable to preload JS file %v", err) + } + + // in case the exec flag holds a JS statement execute it and return if script := ctx.GlobalString(utils.ExecFlag.Name); script != "" { repl.batch(script) } else { |