mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 04:15:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement suggestions

Browse source
This commit is contained in:
Nick Flueckiger 2020-11-22 14:51:48 +01:00 • committed by Jesse Duffield
parent 1f27002b84
commit 7513bfb13a
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
main.go
View file

@ -100,7 +100,7 @@ func main() {
} }
if configDirFlag { if configDirFlag {
fmt.Printf("%s\n", config.ConfigDir("jesseduffield")) fmt.Printf("%s\n", config.ConfigDir())
os.Exit(0) os.Exit(0)
} }

12
pkg/config/app_config.go
View file

@ -81,28 +81,26 @@ func NewAppConfig(name, version, commit, date string, buildSource string, debugg
return appConfig, nil return appConfig, nil
} }
func SelectDefaultConfiguration() string { func ConfigDir() string {
legacyConfigDirectory := ConfigDir("jesseduffield") legacyConfigDirectory := configDirForVendor("jesseduffield")
if _, err := os.Stat(legacyConfigDirectory); !os.IsNotExist(err) { if _, err := os.Stat(legacyConfigDirectory); !os.IsNotExist(err) {
return legacyConfigDirectory return legacyConfigDirectory
} }
configDirectory := ConfigDir("") configDirectory := configDirForVendor("")
return configDirectory return configDirectory
} }
func ConfigDir(vendor string) string { func configDirForVendor(vendor string) string {
envConfigDir := os.Getenv("CONFIG_DIR") envConfigDir := os.Getenv("CONFIG_DIR")
if envConfigDir != "" { if envConfigDir != "" {
return 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") configDirs := xdg.New(vendor, "lazygit")
return configDirs.ConfigHome() return configDirs.ConfigHome()
} }
func findOrCreateConfigDir() (string, error) { func findOrCreateConfigDir() (string, error) {
folder := SelectDefaultConfiguration() folder := ConfigDir()
err := os.MkdirAll(folder, 0755) err := os.MkdirAll(folder, 0755)
if err != nil { if err != nil {
return "", err return "", err