From 1bd850df129eae8a8eb878f22912abf1fdb0255d Mon Sep 17 00:00:00 2001
From: Nick Flueckiger <nick.flueckiger@renuo.ch>
Date: Sun, 22 Nov 2020 15:01:57 +0100
Subject: [PATCH] Add legacy folder loc change

---
 pkg/config/app_config.go | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go
index 3e62e4e9..edf4591b 100644
--- a/pkg/config/app_config.go
+++ b/pkg/config/app_config.go
@@ -465,9 +465,26 @@ func NewAppConfig(name, version, commit, date string, buildSource string, debugg
 	return appConfig, nil
 }
 
+func configDirForVendor(vendor string, projectName string) string {
+	envConfigDir := os.Getenv("CONFIG_DIR")
+	if envConfigDir != "" {
+		return envConfigDir
+	}
+	configDirs := xdg.New(vendor, projectName)
+	return configDirs.ConfigHome()
+}
+
+func configDir(projectName string) string {
+	legacyConfigDirectory := configDirForVendor("jesseduffield", projectName)
+	if _, err := os.Stat(legacyConfigDirectory); !os.IsNotExist(err) {
+		return legacyConfigDirectory
+	}
+	configDirectory := configDirForVendor("", projectName)
+	return configDirectory
+}
+
 func findOrCreateConfigDir(projectName string) (string, error) {
-	configDirs := xdg.New("jesseduffield", projectName)
-	folder := configDirs.ConfigHome()
+	folder := configDir(projectName)
 
 	err := os.MkdirAll(folder, 0755)
 	if err != nil {