gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

common: fix #1818, secondary datadir paths to fall back to

Browse Source
This commit is contained in:
Péter Szilágyi
2015-09-29 17:16:00 +03:00
parent 9b94076717
commit 74578ab22b
3 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
common/path.go
View File

@ -100,14 +100,24 @@ func DefaultAssetPath() string {
}
func DefaultDataDir() string {
usr, _ := user.Current()
if runtime.GOOS == "darwin" {
return filepath.Join(usr.HomeDir, "Library", "Ethereum")
} else if runtime.GOOS == "windows" {
return filepath.Join(usr.HomeDir, "AppData", "Roaming", "Ethereum")
// Try to place the data folder in the user's home dir
var home string
if usr, err := user.Current(); err == nil {
home = usr.HomeDir
} else {
return filepath.Join(usr.HomeDir, ".ethereum")
home = os.Getenv("HOME")
}
if home != "" {
if runtime.GOOS == "darwin" {
return filepath.Join(home, "Library", "Ethereum")
} else if runtime.GOOS == "windows" {
return filepath.Join(home, "AppData", "Roaming", "Ethereum")
} else {
return filepath.Join(home, ".ethereum")
}
}
// As we cannot guess a stable location, return empty and handle later
return ""
}
func DefaultIpcPath() string {