aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorTaylor Gerring <taylor.gerring@gmail.com>2015-02-26 09:32:27 +0800
committerTaylor Gerring <taylor.gerring@gmail.com>2015-02-26 09:32:27 +0800
commitd5aed82b11589bb3f8b0df4544081fe898b8c724 (patch)
tree3dc0bce88e1977145babf50f3017bad73a92919d /cmd
parent8eeab7ea3fb7a01a610e46940141eecf7435873a (diff)
downloaddexon-d5aed82b11589bb3f8b0df4544081fe898b8c724.tar
dexon-d5aed82b11589bb3f8b0df4544081fe898b8c724.tar.gz
dexon-d5aed82b11589bb3f8b0df4544081fe898b8c724.tar.bz2
dexon-d5aed82b11589bb3f8b0df4544081fe898b8c724.tar.lz
dexon-d5aed82b11589bb3f8b0df4544081fe898b8c724.tar.xz
dexon-d5aed82b11589bb3f8b0df4544081fe898b8c724.tar.zst
dexon-d5aed82b11589bb3f8b0df4544081fe898b8c724.zip
DRY DefaultAssetPath()
Diffstat (limited to 'cmd')
-rw-r--r--cmd/mist/flags.go29
-rw-r--r--cmd/utils/cmd.go26
2 files changed, 1 insertions, 54 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 (
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
index d78b6a94d..a65476e69 100644
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@@ -41,7 +41,6 @@ import (
rpcws "github.com/ethereum/go-ethereum/rpc/ws"
"github.com/ethereum/go-ethereum/state"
"github.com/ethereum/go-ethereum/xeth"
- "github.com/kardianos/osext"
)
var clilogger = logger.NewLogger("CLI")
@@ -132,31 +131,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