From 32e698a4392aafcc2e7825ac56e9af3f851b65db Mon Sep 17 00:00:00 2001 From: Mike Brancato Date: Sat, 23 Jun 2018 01:11:06 -0400 Subject: [PATCH] Shift up the preference of the USERPROFILE variable --- homedir.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/homedir.go b/homedir.go index acbb605..8170a8d 100644 --- a/homedir.go +++ b/homedir.go @@ -141,14 +141,16 @@ func dirWindows() (string, error) { return home, nil } + // Prefer standard environment variable USERPROFILE + if home := os.Getenv("USERPROFILE"); home != "" { + return home, nil + } + drive := os.Getenv("HOMEDRIVE") path := os.Getenv("HOMEPATH") home := drive + path if drive == "" || path == "" { - home = os.Getenv("USERPROFILE") - } - if home == "" { - return "", errors.New("HOMEDRIVE, HOMEPATH, and USERPROFILE are blank") + return "", errors.New("HOMEDRIVE, HOMEPATH, or USERPROFILE are blank") } return home, nil