fix(userinfo): use stdlib to find config dir

wfscheper · Feb 26, 2023 · fe858b3 · fe858b3
1 parent 2a02d65
commit fe858b3
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 159 deletions.
diff --git a/internal/userinfo/userinfo.go b/internal/userinfo/userinfo.go
@@ -17,21 +17,17 @@
 package userinfo
 
 import (
-	"errors"
-	"os/user"
+	"os"
 	"path/filepath"
 )
 
 // DefaultConfigFile returns the path to default location for a config file,
 // based on the underlying OS.
 func DefaultConfigFile(appName string) (string, error) {
-	u, err := user.Current()
+	configDir, err := os.UserConfigDir()
 	if err != nil {
 		return "", err
 	}
-	if u.HomeDir == "" {
-		return "", errors.New("cannot determine user specific home directory")
-	}
-	cfgDir := DefaultConfigDir(u.HomeDir)
-	return filepath.Join(cfgDir, appName, appName+".conf"), nil
+
+	return filepath.Join(configDir, appName, appName+".conf"), nil
 }
diff --git a/internal/userinfo/userinfo_darwin.go b/internal/userinfo/userinfo_darwin.go
diff --git a/internal/userinfo/userinfo_darwin_test.go b/internal/userinfo/userinfo_darwin_test.go
diff --git a/internal/userinfo/userinfo_linux.go b/internal/userinfo/userinfo_linux.go
diff --git a/internal/userinfo/userinfo_linux_test.go b/internal/userinfo/userinfo_linux_test.go
diff --git a/internal/userinfo/userinfo_windows.go b/internal/userinfo/userinfo_windows.go