diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-27 03:21:41 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-27 03:21:41 +0800 |
| commit | 76f6d75ef867e754264834fc7171d1a12f24c5bb (patch) | |
| tree | a9531d9e14c15abd72625a98a21a9b988dc32319 /cmd/utils/cmd.go | |
| parent | b2a225a52e45315f3ec90e11707fefa6059d13f5 (diff) | |
| parent | fa7deb10f636d89f668249b78792f8cc48146ee8 (diff) | |
| download | dexon-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar dexon-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar.gz dexon-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar.bz2 dexon-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar.lz dexon-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar.xz dexon-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar.zst dexon-76f6d75ef867e754264834fc7171d1a12f24c5bb.zip | |
Merge branch 'master' into hotfix/0.8.5-2
Diffstat (limited to 'cmd/utils/cmd.go')
| -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 |