From 1e6075d11caa9565e82707fff06e64a7c648464f Mon Sep 17 00:00:00 2001 From: Andinus Date: Mon, 6 Apr 2020 23:21:05 +0530 Subject: Fix logical error in getdir_unix.go --- storage/getdir_unix.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/storage/getdir_unix.go b/storage/getdir_unix.go index 758c048..6f975db 100644 --- a/storage/getdir_unix.go +++ b/storage/getdir_unix.go @@ -11,26 +11,24 @@ import ( // XDG_DATA_HOME is set & if that is not set then assume it to be the // default value which is $HOME/.local/share according to XDG Base // Directory Specification. -func GetDir() string { +func GetDir() (grusCacheDir string) { cacheDir := SysDir() // Grus cache directory is cacheDir/grus. - grusCacheDir := fmt.Sprintf("%s/%s", cacheDir, + grusCacheDir = fmt.Sprintf("%s/%s", cacheDir, "grus") - return grusCacheDir + return } // SysDir returns the system data directory, this is useful for unveil in // OpenBSD. -func SysDir() string { - if len(cacheDir) == 0 { - cacheDir = os.Getenv("XDG_DATA_HOME") - } +func SysDir() (cacheDir string) { + cacheDir = os.Getenv("XDG_DATA_HOME") if len(cacheDir) == 0 { cacheDir = fmt.Sprintf("%s/%s/%s", os.Getenv("HOME"), ".local", "share") } - return cacheDir + return } -- cgit 1.4.1-2-gfad0