oliver/nwg-drawer
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix finding userDirsFile

Browse Source
This commit is contained in:
piotr
2024-02-02 01:39:58 +01:00
parent 8e02b59f83
commit ff34cf8194
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools.go
View File

@@ -78,7 +78,7 @@ func mapXdgUserDirs() map[string]string {
result["pictures"] = filepath.Join(home, "Pictures") result["pictures"] = filepath.Join(home, "Pictures")
result["videos"] = filepath.Join(home, "Videos") result["videos"] = filepath.Join(home, "Videos")
userDirsFile := filepath.Join(filepath.Join(os.Getenv("XDG_CONFIG_HOME"), "user-dirs.dirs")) userDirsFile := filepath.Join(filepath.Join(configHome(), "user-dirs.dirs"))
if pathExists(userDirsFile) { if pathExists(userDirsFile) {
log.Debugf("userDirsFile found: %s", userDirsFile) log.Debugf("userDirsFile found: %s", userDirsFile)
log.Info(fmt.Sprintf("Using XDG user dirs from %s", userDirsFile)) log.Info(fmt.Sprintf("Using XDG user dirs from %s", userDirsFile))
@@ -166,6 +166,13 @@ func configDir() string {
return dir return dir
} }
func configHome() string {
if os.Getenv("XDG_CONFIG_HOME") != "" {
return os.Getenv("XDG_CONFIG_HOME")
}
return path.Join(os.Getenv("HOME"), ".config")
}
func dataDir() string { func dataDir() string {
var dir string var dir string
if xdgData := os.Getenv("XDG_DATA_HOME"); xdgData != "" { if xdgData := os.Getenv("XDG_DATA_HOME"); xdgData != "" {