From 06ce7eefc8d02679283601f83600520285cecfcb Mon Sep 17 00:00:00 2001 From: Stephen McQuay Date: Sun, 4 May 2014 00:54:37 -0700 Subject: [PATCH] Removed dependance on os/user This was done to make cross-compiling work again --- config.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/config.go b/config.go index 6f787dd..c58006b 100644 --- a/config.go +++ b/config.go @@ -7,7 +7,6 @@ import ( "io/ioutil" "log" "os" - "os/user" "strings" ) @@ -50,12 +49,9 @@ func LoadConfig(filename string) (Config, error) { MaxPoints: MAX_POINTS, Mode: DEFAULT_MODE, } - u, err := user.Current() - if err != nil { - return c, err - } + home := os.Getenv("HOME") if len(filename) > 1 && filename[:2] == "~/" { - filename = strings.Replace(filename, "~", u.HomeDir, 1) + filename = strings.Replace(filename, "~", home, 1) } if _, err := os.Stat(filename); os.IsNotExist(err) { log.Printf("%+v not found, using defaults", filename)