diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-26 18:16:01 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-26 19:06:01 +0800 |
| commit | 49ded3aa7752148ebfbacd4e6ff5f46dc9376f89 (patch) | |
| tree | ebde269fc7a836b67eb8d7a2a95a90297d8c2435 /cmd/utils | |
| parent | 5ab0eaa06d2f5879b9b22778988410bd0c73dcc0 (diff) | |
| parent | 9884eed0cf7c95074fd5b3d5f0f592a423810a8a (diff) | |
| download | go-tangerine-49ded3aa7752148ebfbacd4e6ff5f46dc9376f89.tar go-tangerine-49ded3aa7752148ebfbacd4e6ff5f46dc9376f89.tar.gz go-tangerine-49ded3aa7752148ebfbacd4e6ff5f46dc9376f89.tar.bz2 go-tangerine-49ded3aa7752148ebfbacd4e6ff5f46dc9376f89.tar.lz go-tangerine-49ded3aa7752148ebfbacd4e6ff5f46dc9376f89.tar.xz go-tangerine-49ded3aa7752148ebfbacd4e6ff5f46dc9376f89.tar.zst go-tangerine-49ded3aa7752148ebfbacd4e6ff5f46dc9376f89.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Conflicts:
accounts/account_manager.go
Diffstat (limited to 'cmd/utils')
| -rw-r--r-- | cmd/utils/cmd.go | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index bc8fafafb..a36c10e3b 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -25,12 +25,8 @@ import ( "fmt" "os" "os/signal" - "path" - "path/filepath" "regexp" - "runtime" - "bitbucket.org/kardianos/osext" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/eth" @@ -132,31 +128,6 @@ func StartEthereum(ethereum *eth.Ethereum) { }) } -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", "cmd", "mist") { - 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/mist" - case "windows": - assetPath = "./assets" - default: - assetPath = "." - } - } - return assetPath -} - func KeyTasks(keyManager *crypto.KeyManager, KeyRing string, GenAddr bool, SecretFile string, ExportDir string, NonInteractive bool) { var err error |