resolve discussions

tjblackheart · tjblackheart · commit 3f9f2f232787 · 2025-05-17T07:57:43.000+05:30
diff --git a/util/util.go b/util/util.go
@@ -26,20 +26,20 @@ import (
 	"runtime"
 )
 
+const confDir = "symfony5"
+
 func GetHomeDir() string {
 	return getUserHomeDir()
 }
 
 func getUserHomeDir() string {
-	dir := "symfony5"
-	dotDir := "." + dir
 
 	if InCloud() {
 		u, err := user.Current()
 		if err != nil {
-			return filepath.Join(os.TempDir(), dir)
+			return filepath.Join(os.TempDir(), confDir)
 		}
-		return filepath.Join(os.TempDir(), u.Username, dir)
+		return filepath.Join(os.TempDir(), u.Username, confDir)
 	}
 
 	home, err := os.UserHomeDir()
@@ -48,23 +48,22 @@ func getUserHomeDir() string {
 	}
 
 	// use the old path if it exists already
-	fallback := filepath.Join(home, dotDir)
-	if _, err := os.Stat(fallback); !os.IsNotExist(err) {
-		return fallback
+	legacy := filepath.Join(home, "."+confDir)
+	if _, err := os.Stat(legacy); !os.IsNotExist(err) {
+		return legacy
 	}
 
 	// macos only: if $HOME/.config exist, prefer that over 'Library/Application Support'
 	if runtime.GOOS == "darwin" {
 		dotconf := filepath.Join(home, ".config")
 		if _, err := os.Stat(dotconf); !os.IsNotExist(err) {
-			return filepath.Join(dotconf, dir)
+			return filepath.Join(dotconf, confDir)
 		}
 	}
 
-	userCfg, err := os.UserConfigDir()
-	if err != nil {
-		return fallback
+	if userCfg, err := os.UserConfigDir(); err == nil {
+		return filepath.Join(userCfg, confDir)
 	}
 
-	return filepath.Join(userCfg, dir)
+	return legacy
 }

Original file line number	Diff line number	Diff line change
`@@ -26,20 +26,20 @@ import (`
`26`	`26`	`"runtime"`
`27`	`27`	`)`
`28`	`28`
	`29`	`+const confDir = "symfony5"`
	`30`	`+`
`29`	`31`	`func GetHomeDir() string {`
`30`	`32`	`return getUserHomeDir()`
`31`	`33`	`}`
`32`	`34`
`33`	`35`	`func getUserHomeDir() string {`
`34`		`- dir := "symfony5"`
`35`		`- dotDir := "." + dir`
`36`	`36`
`37`	`37`	`if InCloud() {`
`38`	`38`	`u, err := user.Current()`
`39`	`39`	`if err != nil {`
`40`		`- return filepath.Join(os.TempDir(), dir)`
	`40`	`+ return filepath.Join(os.TempDir(), confDir)`
`41`	`41`	`}`
`42`		`- return filepath.Join(os.TempDir(), u.Username, dir)`
	`42`	`+ return filepath.Join(os.TempDir(), u.Username, confDir)`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`home, err := os.UserHomeDir()`
`@@ -48,23 +48,22 @@ func getUserHomeDir() string {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`// use the old path if it exists already`
`51`		`- fallback := filepath.Join(home, dotDir)`
`52`		`- if _, err := os.Stat(fallback); !os.IsNotExist(err) {`
`53`		`- return fallback`
	`51`	`+ legacy := filepath.Join(home, "."+confDir)`
	`52`	`+ if _, err := os.Stat(legacy); !os.IsNotExist(err) {`
	`53`	`+ return legacy`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`// macos only: if $HOME/.config exist, prefer that over 'Library/Application Support'`
`57`	`57`	`if runtime.GOOS == "darwin" {`
`58`	`58`	`dotconf := filepath.Join(home, ".config")`
`59`	`59`	`if _, err := os.Stat(dotconf); !os.IsNotExist(err) {`
`60`		`- return filepath.Join(dotconf, dir)`
	`60`	`+ return filepath.Join(dotconf, confDir)`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`64`		`- userCfg, err := os.UserConfigDir()`
`65`		`- if err != nil {`
`66`		`- return fallback`
	`64`	`+ if userCfg, err := os.UserConfigDir(); err == nil {`
	`65`	`+ return filepath.Join(userCfg, confDir)`
`67`	`66`	`}`
`68`	`67`
`69`		`- return filepath.Join(userCfg, dir)`
	`68`	`+ return legacy`
`70`	`69`	`}`