From 7513bfb13a48c566e9ab0c31e259ea73d562c292 Mon Sep 17 00:00:00 2001
From: Nick Flueckiger <nick.flueckiger@renuo.ch>
Date: Sun, 22 Nov 2020 14:51:48 +0100
Subject: Implement suggestions

---
 main.go                  |  2 +-
 pkg/config/app_config.go | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/main.go b/main.go
index 50efdca67..131f1e6e3 100644
--- 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
index 5e0a08316..86801781b 100644
--- 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
-- 
cgit v1.2.3