diff options
| author | Felix Lange <fjl@twurst.com> | 2016-09-29 20:24:37 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-29 20:24:37 +0800 |
| commit | 44bc2e80ddf82ea2a37c25e7beb0ca06b46b7308 (patch) | |
| tree | aaab07e78f7b9341f0fcfbd9348fe96273bd6a0d /cmd/utils/customflags.go | |
| parent | 4e8cec05abb567457e80185cb9fcf7ec2cc90596 (diff) | |
| parent | b42a5b118f1aa7ac1235547c8594146978941401 (diff) | |
| download | dexon-44bc2e80ddf82ea2a37c25e7beb0ca06b46b7308.tar dexon-44bc2e80ddf82ea2a37c25e7beb0ca06b46b7308.tar.gz dexon-44bc2e80ddf82ea2a37c25e7beb0ca06b46b7308.tar.bz2 dexon-44bc2e80ddf82ea2a37c25e7beb0ca06b46b7308.tar.lz dexon-44bc2e80ddf82ea2a37c25e7beb0ca06b46b7308.tar.xz dexon-44bc2e80ddf82ea2a37c25e7beb0ca06b46b7308.tar.zst dexon-44bc2e80ddf82ea2a37c25e7beb0ca06b46b7308.zip | |
Merge pull request #2914 from fjl/node-coinhabit
cmd/utils, node: make datadir reusable for bzzd
Diffstat (limited to 'cmd/utils/customflags.go')
| -rw-r--r-- | cmd/utils/customflags.go | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/cmd/utils/customflags.go b/cmd/utils/customflags.go index 5cbccfe98..11c92d451 100644 --- a/cmd/utils/customflags.go +++ b/cmd/utils/customflags.go @@ -137,9 +137,19 @@ func (self *DirectoryFlag) Set(value string) { // Note, it has limitations, e.g. ~someuser/tmp will not be expanded func expandPath(p string) string { if strings.HasPrefix(p, "~/") || strings.HasPrefix(p, "~\\") { - if user, err := user.Current(); err == nil { - p = user.HomeDir + p[1:] + if home := homeDir(); home != "" { + p = home + p[1:] } } return path.Clean(os.ExpandEnv(p)) } + +func homeDir() string { + if home := os.Getenv("HOME"); home != "" { + return home + } + if usr, err := user.Current(); err == nil { + return usr.HomeDir + } + return "" +} |