aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/geth/main.go
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-05-20 17:31:52 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-05-20 17:31:52 +0800
commit0300eef94d7d1e58bc5cf94094a3d492c70486e1 (patch)
treed2828b978ad2a0128459c9a09096aec95b18af1c /cmd/geth/main.go
parent6b83a0a589d4615382de3d9f3ed2800064b4c1b9 (diff)
parente1d1417729b82f00bcb62dffa36358cb74ab790f (diff)
downloadgo-tangerine-0300eef94d7d1e58bc5cf94094a3d492c70486e1.tar
go-tangerine-0300eef94d7d1e58bc5cf94094a3d492c70486e1.tar.gz
go-tangerine-0300eef94d7d1e58bc5cf94094a3d492c70486e1.tar.bz2
go-tangerine-0300eef94d7d1e58bc5cf94094a3d492c70486e1.tar.lz
go-tangerine-0300eef94d7d1e58bc5cf94094a3d492c70486e1.tar.xz
go-tangerine-0300eef94d7d1e58bc5cf94094a3d492c70486e1.tar.zst
go-tangerine-0300eef94d7d1e58bc5cf94094a3d492c70486e1.zip
Merge pull request #1048 from ethersphere/cli-fixes
CLI, JSRE admin and Solc improvements
Diffstat (limited to 'cmd/geth/main.go')
-rw-r--r--cmd/geth/main.go12
1 files changed, 9 insertions, 3 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index 2afc92f10..ba253bbeb 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -99,7 +99,15 @@ The output of this command is supposed to be machine-readable.
Usage: "import ethereum presale wallet",
},
},
- },
+ Description: `
+
+ get wallet import /path/to/my/presale.wallet
+
+will prompt for your password and imports your ether presale account.
+It can be used non-interactively with the --password option taking a
+passwordfile as argument containing the wallet password in plaintext.
+
+`},
{
Action: accountList,
Name: "account",
@@ -326,7 +334,6 @@ func console(ctx *cli.Context) {
repl := newJSRE(
ethereum,
ctx.String(utils.JSpathFlag.Name),
- ctx.String(utils.SolcPathFlag.Name),
ctx.GlobalString(utils.RPCCORSDomainFlag.Name),
true,
nil,
@@ -348,7 +355,6 @@ func execJSFiles(ctx *cli.Context) {
repl := newJSRE(
ethereum,
ctx.String(utils.JSpathFlag.Name),
- ctx.String(utils.SolcPathFlag.Name),
ctx.GlobalString(utils.RPCCORSDomainFlag.Name),
false,
nil,