From c0ae5c58a6b3d78540ec19b24bd31b6e14e24191 Mon Sep 17 00:00:00 2001 From: Maran Date: Tue, 15 Jul 2014 12:52:30 +0200 Subject: Rewrote mnemonic word loading to facilitate deployable builds. --- utils/cmd.go | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'utils/cmd.go') diff --git a/utils/cmd.go b/utils/cmd.go index 889726b04..fac164b47 100644 --- a/utils/cmd.go +++ b/utils/cmd.go @@ -1,6 +1,7 @@ package utils import ( + "bitbucket.org/kardianos/osext" "fmt" "github.com/ethereum/eth-go" "github.com/ethereum/eth-go/ethcrypto" @@ -16,6 +17,8 @@ import ( "os" "os/signal" "path" + "path/filepath" + "runtime" "time" ) @@ -164,7 +167,33 @@ func NewKeyManager(KeyStore string, Datadir string, db ethutil.Database) *ethcry return keyManager } +func DefaultAssetPath() string { + var assetPath string + // If the current working directory is the go-ethereum dir + // assume a debug build and use the source directory as + // asset directory. + pwd, _ := os.Getwd() + if pwd == path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "ethereal") { + assetPath = path.Join(pwd, "assets") + } else { + switch runtime.GOOS { + case "darwin": + // Get Binary Directory + exedir, _ := osext.ExecutableFolder() + assetPath = filepath.Join(exedir, "../Resources") + case "linux": + assetPath = "/usr/share/ethereal" + case "windows": + assetPath = "./assets" + default: + assetPath = "." + } + } + return assetPath +} func KeyTasks(keyManager *ethcrypto.KeyManager, KeyRing string, GenAddr bool, SecretFile string, ExportDir string, NonInteractive bool) { + ethcrypto.InitWords(DefaultAssetPath()) // Init mnemonic word list + var err error switch { case GenAddr: -- cgit v1.2.3 From 223432fa1eedb9fa5c712056afb804322aa12b02 Mon Sep 17 00:00:00 2001 From: Maran Date: Tue, 15 Jul 2014 16:21:16 +0200 Subject: Work around crash issues when building OSX binary --- utils/cmd.go | 1 + 1 file changed, 1 insertion(+) (limited to 'utils/cmd.go') diff --git a/utils/cmd.go b/utils/cmd.go index fac164b47..1e1599582 100644 --- a/utils/cmd.go +++ b/utils/cmd.go @@ -191,6 +191,7 @@ func DefaultAssetPath() string { } return assetPath } + func KeyTasks(keyManager *ethcrypto.KeyManager, KeyRing string, GenAddr bool, SecretFile string, ExportDir string, NonInteractive bool) { ethcrypto.InitWords(DefaultAssetPath()) // Init mnemonic word list -- cgit v1.2.3