roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Merge pull request #2110 from LefterisJP/determining_home_for_ubuntu_core

Browse Source 
common: Fix HomeDir detection
This commit is contained in:
Felix Lange 2016-01-08 14:24:49 +01:00
commit 0ab8a175d8
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

@ -63,13 +63,14 @@ func AbsolutePath(Datadir string, filename string) string {
return filepath.Join(Datadir, filename) return filepath.Join(Datadir, filename)
} }
func HomeDir() (home string) { func HomeDir() string {
if usr, err := user.Current(); err == nil { if home := os.Getenv("HOME"); home != "" {
home = usr.HomeDir return home
} else {
home = os.Getenv("HOME")
} }
return if usr, err := user.Current(); err == nil {
return usr.HomeDir
}
return ""
} }
func DefaultDataDir() string { func DefaultDataDir() string {