poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #828 from tgerring/pathfixes 

Remove path separator literals
This commit is contained in:
Jeffrey Wilcke 2015-04-29 01:54:47 -07:00
parent a6a49ccbf7 f8cdff9a5d
commit 32373e3837
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/path.go
View File

@ -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 {
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 {
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")
} }