From a66abedab5e8207a4533da79231928684ae0ffea Mon Sep 17 00:00:00 2001 From: Matt Drollette Date: Thu, 22 Jan 2015 09:36:36 -0600 Subject: [PATCH] use cross-compile compatible home dir detection Signed-off-by: Matt Drollette --- flags.go | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/flags.go b/flags.go index 33fabea961..e5891b5ce6 100644 --- a/flags.go +++ b/flags.go @@ -1,21 +1,17 @@ package main import ( - "os" - "os/user" - "path" - "github.com/codegangsta/cli" - - log "github.com/Sirupsen/logrus" + "os" + "path/filepath" + "runtime" ) func homepath(p string) string { - usr, err := user.Current() - if err != nil { - log.Fatal(err) + if runtime.GOOS == "windows" { + return filepath.Join(os.Getenv("USERPROFILE"), p) } - return path.Join(usr.HomeDir, p) + return filepath.Join(os.Getenv("HOME"), p) } func getDiscovery(c *cli.Context) string {