cupcakearmy/autorestic
1
0
Fork 0
mirror of https://github.com/cupcakearmy/autorestic.git synced 2025-09-08 11:30:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of XDG_CONFIG_HOME (#347)

Browse Source
This commit is contained in:
Christoph Loy
2024-01-11 19:01:59 +01:00
committed by GitHub
parent 046c79fd15
commit ce9140fa1e
3 changed files with 58 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
cmd/root.go
View File

@@ -59,24 +59,7 @@ func initConfig() {
os.Exit(1)
}
} else {
configPaths := []string{"."}
// Home
if home, err := homedir.Dir(); err == nil {
configPaths = append(configPaths, home)
}
// XDG_CONFIG_HOME
{
prefix, found := os.LookupEnv("XDG_CONFIG_HOME")
if !found {
if home, err := homedir.Dir(); err != nil {
prefix = filepath.Join(home, ".config")
}
}
xdgConfig := filepath.Join(prefix, "autorestic")
configPaths = append(configPaths, xdgConfig)
}
configPaths := getConfigPaths()
for _, cfgPath := range configPaths {
viper.AddConfigPath(cfgPath)
}
@@ -88,3 +71,22 @@ func initConfig() {
viper.AutomaticEnv()
}
}
func getConfigPaths() []string {
result := []string{"."}
if home, err := homedir.Dir(); err == nil {
result = append(result, home)
}
{
xdgConfigHome, found := os.LookupEnv("XDG_CONFIG_HOME")
if !found {
if home, err := homedir.Dir(); err == nil {
xdgConfigHome = filepath.Join(home, ".config")
}
}
xdgConfig := filepath.Join(xdgConfigHome, "autorestic")
result = append(result, xdgConfig)
}
return result
}