all: Cleanups enabled by Go 1.12

This commit is contained in:
Jakob Borg
2019-11-10 09:47:17 +01:00
parent 879f51b027
commit 1d99e5277a
4 changed files with 15 additions and 26 deletions

View File

@@ -35,23 +35,16 @@ func ExpandTilde(path string) (string, error) {
}
func getHomeDir() (string, error) {
var home string
switch runtime.GOOS {
case "windows":
home = filepath.Join(os.Getenv("HomeDrive"), os.Getenv("HomePath"))
if home == "" {
home = os.Getenv("UserProfile")
if runtime.GOOS == "windows" {
// Legacy -- we prioritize this for historical reasons, whereas
// os.UserHomeDir uses %USERPROFILE% always.
home := filepath.Join(os.Getenv("HomeDrive"), os.Getenv("HomePath"))
if home != "" {
return home, nil
}
default:
home = os.Getenv("HOME")
}
if home == "" {
return "", errNoHome
}
return home, nil
return os.UserHomeDir()
}
var windowsDisallowedCharacters = string([]rune{