From ff34cf8194e567f14c36bd1ae5e683a50bf3a882 Mon Sep 17 00:00:00 2001 From: piotr Date: Fri, 2 Feb 2024 01:39:58 +0100 Subject: [PATCH] fix finding userDirsFile --- tools.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools.go b/tools.go index 4d0e16c..98c71b7 100644 --- a/tools.go +++ b/tools.go @@ -78,7 +78,7 @@ func mapXdgUserDirs() map[string]string { result["pictures"] = filepath.Join(home, "Pictures") 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) { log.Debugf("userDirsFile found: %s", userDirsFile) log.Info(fmt.Sprintf("Using XDG user dirs from %s", userDirsFile)) @@ -166,6 +166,13 @@ func configDir() string { 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 { var dir string if xdgData := os.Getenv("XDG_DATA_HOME"); xdgData != "" {