Merge pull request #245 from Liberatys/feature/add-new-config-folder-loc

Add legacy folder loc change
This commit is contained in:
Jesse Duffield 2020-11-28 10:46:21 +11:00 committed by GitHub
commit 2d37030a40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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 {