diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-02-26 17:59:07 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-02-26 17:59:07 +0800 |
| commit | 5b202a158adedfea4d0be734e473bccdf103d987 (patch) | |
| tree | 4e4ac05bb15d2ee2d035695d67f04ee4b4974df7 /cmd/utils/cmd.go | |
| parent | 46ce66a82905185b2b42803d58f5d8f00431e03c (diff) | |
| parent | 57cea0c623ed808ad134bd62610afb6b842f5d0d (diff) | |
| download | dexon-5b202a158adedfea4d0be734e473bccdf103d987.tar dexon-5b202a158adedfea4d0be734e473bccdf103d987.tar.gz dexon-5b202a158adedfea4d0be734e473bccdf103d987.tar.bz2 dexon-5b202a158adedfea4d0be734e473bccdf103d987.tar.lz dexon-5b202a158adedfea4d0be734e473bccdf103d987.tar.xz dexon-5b202a158adedfea4d0be734e473bccdf103d987.tar.zst dexon-5b202a158adedfea4d0be734e473bccdf103d987.zip | |
Merge pull request #391 from tgerring/osext
Cleanup DefaultAssetPath
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 |