diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-02-26 09:32:27 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-02-26 09:32:27 +0800 |
| commit | d5aed82b11589bb3f8b0df4544081fe898b8c724 (patch) | |
| tree | 3dc0bce88e1977145babf50f3017bad73a92919d /cmd/mist | |
| parent | 8eeab7ea3fb7a01a610e46940141eecf7435873a (diff) | |
| download | dexon-d5aed82b11589bb3f8b0df4544081fe898b8c724.tar.gz dexon-d5aed82b11589bb3f8b0df4544081fe898b8c724.tar.zst dexon-d5aed82b11589bb3f8b0df4544081fe898b8c724.zip | |
DRY DefaultAssetPath()
Diffstat (limited to 'cmd/mist')
| -rw-r--r-- | cmd/mist/flags.go | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/cmd/mist/flags.go b/cmd/mist/flags.go index c4edb8dae..8dab59d80 100644 --- a/cmd/mist/flags.go +++ b/cmd/mist/flags.go @@ -68,33 +68,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 +95,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 ( |