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/mist | |
| parent | 46ce66a82905185b2b42803d58f5d8f00431e03c (diff) | |
| parent | 57cea0c623ed808ad134bd62610afb6b842f5d0d (diff) | |
| download | dexon-5b202a158adedfea4d0be734e473bccdf103d987.tar.gz dexon-5b202a158adedfea4d0be734e473bccdf103d987.tar.zst dexon-5b202a158adedfea4d0be734e473bccdf103d987.zip | |
Merge pull request #391 from tgerring/osext
Cleanup DefaultAssetPath
Diffstat (limited to 'cmd/mist')
| -rw-r--r-- | cmd/mist/flags.go | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/cmd/mist/flags.go b/cmd/mist/flags.go index d5ed60a21..0010df826 100644 --- a/cmd/mist/flags.go +++ b/cmd/mist/flags.go @@ -27,10 +27,8 @@ import ( "log" "os" "path" - "path/filepath" "runtime" - "bitbucket.org/kardianos/osext" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/logger" @@ -68,33 +66,6 @@ var ( // flags specific to gui client var AssetPath string - -//TODO: If we re-use the one defined in cmd.go the binary osx image crashes. If somebody finds out why we can dry this up. -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 -} - var defaultConfigFile = path.Join(ethutil.DefaultDataDir(), "conf.ini") func Init() { @@ -122,7 +93,7 @@ func Init() { flag.StringVar(&DebugFile, "debug", "", "debug file (no debugging if not set)") flag.IntVar(&LogLevel, "loglevel", int(logger.InfoLevel), "loglevel: 0-5: silent,error,warn,info,debug,debug detail)") - flag.StringVar(&AssetPath, "asset_path", defaultAssetPath(), "absolute path to GUI assets directory") + flag.StringVar(&AssetPath, "asset_path", ethutil.DefaultAssetPath(), "absolute path to GUI assets directory") // Network stuff var ( |