internal: inline getOSUserConfigDir

google · Jun 27, 2022 · 8442404 · 8442404
1 parent bf851ab
commit 8442404
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/internal/internal.go b/internal/internal.go
@@ -22,8 +22,8 @@ func ConfigDir() (string, error) {
 		return configDir, nil
 	}
 
-	if osUserConfigDir := getOSUserConfigDir(); osUserConfigDir != "" {
-		return filepath.Join(osUserConfigDir, "gops"), nil
+	if userConfigDir, err := os.UserConfigDir(); err == nil {
+		return filepath.Join(userConfigDir, "gops"), nil
 	}
 
 	if runtime.GOOS == "windows" {
@@ -41,14 +41,6 @@ func ConfigDir() (string, error) {
 	return filepath.Join(homeDir, ".config", "gops"), nil
 }
 
-func getOSUserConfigDir() string {
-	configDir, err := os.UserConfigDir()
-	if err != nil {
-		return ""
-	}
-	return configDir
-}
-
 func guessUnixHomeDir() string {
 	usr, err := user.Current()
 	if err == nil {