diff options
author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-22 20:44:17 +0800 |
---|---|---|
committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-22 20:44:17 +0800 |
commit | c0741edc34c3d09b69c7a64a97aaca0e7759add1 (patch) | |
tree | 93b31a77c875ec58d182a07092bf1589b901cf5a /common/common.go | |
parent | 82a41a198e3ac217e1c349c7300b1fb28e4982ab (diff) | |
download | go-tangerine-c0741edc34c3d09b69c7a64a97aaca0e7759add1.tar go-tangerine-c0741edc34c3d09b69c7a64a97aaca0e7759add1.tar.gz go-tangerine-c0741edc34c3d09b69c7a64a97aaca0e7759add1.tar.bz2 go-tangerine-c0741edc34c3d09b69c7a64a97aaca0e7759add1.tar.lz go-tangerine-c0741edc34c3d09b69c7a64a97aaca0e7759add1.tar.xz go-tangerine-c0741edc34c3d09b69c7a64a97aaca0e7759add1.tar.zst go-tangerine-c0741edc34c3d09b69c7a64a97aaca0e7759add1.zip |
Move OS-specific funcs to path.go
Diffstat (limited to 'common/common.go')
-rw-r--r-- | common/common.go | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/common/common.go b/common/common.go index 9045151f5..b5eacfdb7 100644 --- a/common/common.go +++ b/common/common.go @@ -3,14 +3,8 @@ package common import ( "fmt" "math/big" - "os" - "os/user" - "path" - "path/filepath" "runtime" "time" - - "github.com/kardianos/osext" ) // MakeName creates a node name that follows the ethereum convention @@ -20,62 +14,6 @@ func MakeName(name, version string) string { return fmt.Sprintf("%s/v%s/%s/%s", name, version, runtime.GOOS, runtime.Version()) } -func DefaultAssetPath() string { - var assetPath string - pwd, _ := os.Getwd() - srcdir := path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "cmd", "mist") - - // If the current working directory is the go-ethereum dir - // assume a debug build and use the source directory as - // asset directory. - if pwd == srcdir { - 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 = "." - } - } - - // Check if the assetPath exists. If not, try the source directory - // This happens when binary is run from outside cmd/mist directory - if _, err := os.Stat(assetPath); os.IsNotExist(err) { - assetPath = path.Join(srcdir, "assets") - } - - return assetPath -} - -func DefaultDataDir() string { - usr, _ := user.Current() - if runtime.GOOS == "darwin" { - return path.Join(usr.HomeDir, "Library/Ethereum") - } else if runtime.GOOS == "windows" { - return path.Join(usr.HomeDir, "AppData/Roaming/Ethereum") - } else { - return path.Join(usr.HomeDir, ".ethereum") - } -} - -func IsWindows() bool { - return runtime.GOOS == "windows" -} - -func WindonizePath(path string) string { - if string(path[0]) == "/" && IsWindows() { - path = path[1:] - } - return path -} - // Common big integers often used var ( Big1 = big.NewInt(1) |