Merge pull request #225 from kkirsche/enhancement/UserHomeDir

Fix #198 - Use os.UserHomeDir() instead of custom function

Author: twpayne

.travis.yml

@@ -7,7 +7,7 @@ addons:
     - rpm
 
 go:
-  - 1.11.x
+  - 1.12.x
 
 env:
   - GO111MODULE=on

cmd/config.go

@@ -3,7 +3,6 @@ package cmd
 import (
 	"bufio"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -286,7 +285,7 @@ func getDefaultData(fs vfs.FS) (map[string]interface{}, error) {
 		return nil, err
 	}
 
-	homedir, err := userHomeDir()
+	homedir, err := os.UserHomeDir()
 	if err != nil {
 		return nil, err
 	}
@@ -387,31 +386,3 @@ func upperSnakeCaseToCamelCaseMap(m map[string]string) map[string]string {
 	}
 	return result
 }
-
-// userHomeDir returns the current user's home directory.
-//
-// On Unix, including macOS, it returns the $HOME environment variable.
-// On Windows, it returns %USERPROFILE%.
-// On Plan 9, it returns the $home environment variable.
-//
-// FIXME this is copied from https://tip.golang.org/src/os/file.go?s=11606:11640#L379.
-// Replace it with os.UserHomeDir when Go 1.12 is released.
-func userHomeDir() (string, error) {
-	env, enverr := "HOME", "$HOME"
-	switch runtime.GOOS {
-	case "windows":
-		env, enverr = "USERPROFILE", "%userprofile%"
-	case "plan9":
-		env, enverr = "home", "$home"
-	case "nacl", "android":
-		return "/", nil
-	case "darwin":
-		if runtime.GOARCH == "arm" || runtime.GOARCH == "arm64" {
-			return "/", nil
-		}
-	}
-	if v := os.Getenv(env); v != "" {
-		return v, nil
-	}
-	return "", errors.New(enverr + " is not defined")
-}

cmd/root.go

@@ -35,7 +35,7 @@ var rootCmd = &cobra.Command{
 func init() {
 	rootCmd.Version = fmt.Sprintf("%s, commit %s, built at %s", version, commit, date)
 
-	homeDir, err := userHomeDir()
+	homeDir, err := os.UserHomeDir()
 	if err != nil {
 		printErrorAndExit(err)
 	}