Implement suggestions

Nick Flueckiger · jesseduffield · commit 7513bfb13a48 · 2020-11-28T10:42:38.000+11:00
diff --git a/main.go b/main.go
@@ -100,7 +100,7 @@ func main() {
 	}
 
 	if configDirFlag {
-		fmt.Printf("%s\n", config.ConfigDir("jesseduffield"))
+		fmt.Printf("%s\n", config.ConfigDir())
 		os.Exit(0)
 	}
 
diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go
@@ -81,28 +81,26 @@ func NewAppConfig(name, version, commit, date string, buildSource string, debugg
 	return appConfig, nil
 }
 
-func SelectDefaultConfiguration() string {
-	legacyConfigDirectory := ConfigDir("jesseduffield")
+func ConfigDir() string {
+	legacyConfigDirectory := configDirForVendor("jesseduffield")
 	if _, err := os.Stat(legacyConfigDirectory); !os.IsNotExist(err) {
 		return legacyConfigDirectory
 	}
-	configDirectory := ConfigDir("")
+	configDirectory := configDirForVendor("")
 	return configDirectory
 }
 
-func ConfigDir(vendor string) string {
+func configDirForVendor(vendor string) string {
 	envConfigDir := os.Getenv("CONFIG_DIR")
 	if envConfigDir != "" {
 		return envConfigDir
 	}
-	// chucking my name there is not for vanity purposes, the xdg spec (and that
-	// function) requires a vendor name. May as well line up with github
 	configDirs := xdg.New(vendor, "lazygit")
 	return configDirs.ConfigHome()
 }
 
 func findOrCreateConfigDir() (string, error) {
-	folder := SelectDefaultConfiguration()
+	folder := ConfigDir()
 	err := os.MkdirAll(folder, 0755)
 	if err != nil {
 		return "", err

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ func main() {`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`if configDirFlag {`
`103`		`- fmt.Printf("%s\n", config.ConfigDir("jesseduffield"))`
	`103`	`+ fmt.Printf("%s\n", config.ConfigDir())`
`104`	`104`	`os.Exit(0)`
`105`	`105`	`}`
`106`	`106`