aboutsummaryrefslogtreecommitdiffstats
path: root/utils/cmd.go
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-07-02 02:10:49 +0800
committerobscuren <geffobscura@gmail.com>2014-07-02 02:10:49 +0800
commit4918531dd5c0a10e193d991fb6661b8af6680b11 (patch)
treeb3748c6af162b3b86076badb6176182227192cb4 /utils/cmd.go
parentcb595fb63cf4f0d0d9b8b145786b9eec7aadcf22 (diff)
parent283532137713d20ca82d264bd105cf7cb0e47b65 (diff)
downloaddexon-4918531dd5c0a10e193d991fb6661b8af6680b11.tar
dexon-4918531dd5c0a10e193d991fb6661b8af6680b11.tar.gz
dexon-4918531dd5c0a10e193d991fb6661b8af6680b11.tar.bz2
dexon-4918531dd5c0a10e193d991fb6661b8af6680b11.tar.lz
dexon-4918531dd5c0a10e193d991fb6661b8af6680b11.tar.xz
dexon-4918531dd5c0a10e193d991fb6661b8af6680b11.tar.zst
dexon-4918531dd5c0a10e193d991fb6661b8af6680b11.zip
Merge branch 'develop'
Diffstat (limited to 'utils/cmd.go')
-rw-r--r--utils/cmd.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/utils/cmd.go b/utils/cmd.go
index 7b2ac0e40..e10addf6c 100644
--- a/utils/cmd.go
+++ b/utils/cmd.go
@@ -106,6 +106,7 @@ func InitConfig(ConfigFile string, Datadir string, Identifier string, EnvPrefix
func exit(err error) {
status := 0
if err != nil {
+ fmt.Println(err)
logger.Errorln("Fatal: ", err)
status = 1
}
@@ -167,6 +168,8 @@ func KeyTasks(keyManager *ethcrypto.KeyManager, KeyRing string, GenAddr bool, Se
}
exit(err)
case len(SecretFile) > 0:
+ SecretFile = ethutil.ExpandHomePath(SecretFile)
+
if NonInteractive || confirm("This action overwrites your old private key.") {
err = keyManager.InitFromSecretsFile(KeyRing, 0, SecretFile)
}