浏览代码

Merge pull request #467 from Morganamilo/fix#466

 Fix file paths
Anna 7 年之前
父节点
当前提交
cf6068dbd3
共有 1 个文件被更改,包括 14 次插入2 次删除
  1. 14 2
      main.go

+ 14 - 2
main.go

@@ -12,16 +12,28 @@ import (
 
 
 func setPaths() error {
 func setPaths() error {
 	if _configHome, set := os.LookupEnv("XDG_CONFIG_HOME"); set {
 	if _configHome, set := os.LookupEnv("XDG_CONFIG_HOME"); set {
-		cacheHome = filepath.Join(_configHome, "yay")
+		if _configHome == "" {
+			fmt.Errorf("XDG_CONFIG_HOME set but empty")
+		}
+		configHome = filepath.Join(_configHome, "yay")
 	} else if _configHome, set := os.LookupEnv("HOME"); set {
 	} else if _configHome, set := os.LookupEnv("HOME"); set {
-		cacheHome = filepath.Join(_configHome, ".config/yay")
+		if _configHome == "" {
+			fmt.Errorf("HOME set but empty")
+		}
+		configHome = filepath.Join(_configHome, ".config/yay")
 	} else {
 	} else {
 		fmt.Errorf("XDG_CONFIG_HOME and HOME unset")
 		fmt.Errorf("XDG_CONFIG_HOME and HOME unset")
 	}
 	}
 
 
 	if _cacheHome, set := os.LookupEnv("XDG_CACHE_HOME"); set {
 	if _cacheHome, set := os.LookupEnv("XDG_CACHE_HOME"); set {
+		if _cacheHome == "" {
+			fmt.Errorf("XDG_CACHE_HOME set but empty")
+		}
 		cacheHome = filepath.Join(_cacheHome, "yay")
 		cacheHome = filepath.Join(_cacheHome, "yay")
 	} else if _cacheHome, set := os.LookupEnv("HOME"); set {
 	} else if _cacheHome, set := os.LookupEnv("HOME"); set {
+		if _cacheHome == "" {
+			fmt.Errorf("XDG_CACHE_HOME set but empty")
+		}
 		cacheHome = filepath.Join(_cacheHome, ".cache/yay")
 		cacheHome = filepath.Join(_cacheHome, ".cache/yay")
 	} else {
 	} else {
 		fmt.Errorf("XDG_CACHE_HOME and HOME unset")
 		fmt.Errorf("XDG_CACHE_HOME and HOME unset")