good morning!!!!

Skip to content
Snippets Groups Projects
Commit f8cdff9a authored by Taylor Gerring's avatar Taylor Gerring
Browse files

Remove path separator literals

parent a6a49ccb
No related branches found
No related tags found
No related merge requests found
...@@ -21,9 +21,10 @@ func MakeName(name, version string) string { ...@@ -21,9 +21,10 @@ func MakeName(name, version string) string {
func ExpandHomePath(p string) (path string) { func ExpandHomePath(p string) (path string) {
path = p path = p
sep := fmt.Sprintf("%s", os.PathSeparator)
// Check in case of paths like "/something/~/something/" // Check in case of paths like "/something/~/something/"
if len(path) > 1 && path[:2] == "~/" { if len(p) > 1 && p[:1+len(sep)] == "~"+sep {
usr, _ := user.Current() usr, _ := user.Current()
dir := usr.HomeDir dir := usr.HomeDir
...@@ -64,11 +65,11 @@ func DefaultAssetPath() string { ...@@ -64,11 +65,11 @@ func DefaultAssetPath() string {
case "darwin": case "darwin":
// Get Binary Directory // Get Binary Directory
exedir, _ := osext.ExecutableFolder() exedir, _ := osext.ExecutableFolder()
assetPath = filepath.Join(exedir, "../Resources") assetPath = filepath.Join(exedir, "..", "Resources")
case "linux": case "linux":
assetPath = "/usr/share/mist" assetPath = path.Join("usr", "share", "mist")
case "windows": case "windows":
assetPath = "./assets" assetPath = path.Join(".", "assets")
default: default:
assetPath = "." assetPath = "."
} }
...@@ -86,9 +87,9 @@ func DefaultAssetPath() string { ...@@ -86,9 +87,9 @@ func DefaultAssetPath() string {
func DefaultDataDir() string { func DefaultDataDir() string {
usr, _ := user.Current() usr, _ := user.Current()
if runtime.GOOS == "darwin" { if runtime.GOOS == "darwin" {
return path.Join(usr.HomeDir, "Library/Ethereum") return path.Join(usr.HomeDir, "Library", "Ethereum")
} else if runtime.GOOS == "windows" { } else if runtime.GOOS == "windows" {
return path.Join(usr.HomeDir, "AppData/Roaming/Ethereum") return path.Join(usr.HomeDir, "AppData", "Roaming", "Ethereum")
} else { } else {
return path.Join(usr.HomeDir, ".ethereum") return path.Join(usr.HomeDir, ".ethereum")
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment