Feature/xdg base dir 2

packer/cache.go

@@ -5,16 +5,12 @@ import (
 	"path/filepath"
 )
 
-var DefaultCacheDir = "packer_cache"
-
 // CachePath returns an absolute path to a cache file or directory
 //
-// When the directory is not absolute, CachePath will try to get
-// current working directory to be able to return a full path.
-// CachePath tries to create the resulting path if it doesn't exist.
-//
-// CachePath can error in case it cannot find the cwd.
+// When the directory is not absolute, CachePath will try to make a
+// a cache depending on the operating system.
 //
+// NOTE: cache directory will change depending on operating system dependent
 // ex:
 //   PACKER_CACHE_DIR=""            CacheDir() => "./packer_cache/
 //   PACKER_CACHE_DIR=""            CacheDir("foo") => "./packer_cache/foo
@@ -25,11 +21,15 @@ func CachePath(paths ...string) (path string, err error) {
 		// create the dir based on return path if it doesn't exist
 		os.MkdirAll(filepath.Dir(path), os.ModePerm)
 	}()
-	cacheDir := DefaultCacheDir
+	cacheDir := getDefaultCacheDir()
 	if cd := os.Getenv("PACKER_CACHE_DIR"); cd != "" {
 		cacheDir = cd
 	}
 
 	paths = append([]string{cacheDir}, paths...)
-	return filepath.Abs(filepath.Join(paths...))
+	result, err := filepath.Abs(filepath.Join(paths...))
+	if err != nil {
+		return "", err
+	}
+	return result, err
 }

packer/cache_config_unix.go

@@ -0,0 +1,21 @@
+// +build darwin freebsd linux netbsd openbsd solaris
+
+package packer
+
+import (
+	"os"
+	"path/filepath"
+)
+
+func getDefaultCacheDir() string {
+	var defaultConfigFileDir string
+
+	if xdgCacheHome := os.Getenv("XDG_CACHE_HOME"); xdgCacheHome != "" {
+		defaultConfigFileDir = filepath.Join(xdgCacheHome, "packer")
+	} else {
+		homeDir := os.Getenv("HOME")
+		defaultConfigFileDir = filepath.Join(homeDir, ".cache")
+	}
+
+	return defaultConfigFileDir
+}

packer/cache_config_windows.go

@@ -0,0 +1,11 @@
+// +build windows
+
+package packer
+
+const (
+	defaultConfigFile = "packer_cache"
+)
+
+func getDefaultCacheDir() string {
+	return defaultConfigFile
+}

pathing/config_file.go

@@ -70,22 +70,6 @@ func configFile() (string, error) {
 	return filepath.Join(dir, defaultConfigFile), nil
 }
 
-func configDir() (string, error) {
-	var dir string
-	if cd := os.Getenv("PACKER_CONFIG_DIR"); cd != "" {
-		log.Printf("Detected config directory from env var: %s", cd)
-		dir = cd
-	} else {
-		homedir, err := homeDir()
-		if err != nil {
-			return "", err
-		}
-		dir = homedir
-	}
-
-	return filepath.Join(dir, defaultConfigDir), nil
-}
-
 // Given a path, check to see if it's using ~ to reference a user directory.
 // If so, then replace that component with the requested user directory.
 // In "~/", "~" gets replaced by current user's home dir.

pathing/config_file_unix.go

@@ -2,7 +2,42 @@
 
 package pathing
 
+import (
+	"log"
+	"os"
+	"path/filepath"
+)
+
 const (
 	defaultConfigFile = ".packerconfig"
 	defaultConfigDir  = ".packer.d"
 )
+
+func configDir() (path string, err error) {
+	var dir string
+	homedir := os.Getenv("HOME")
+	if homedir == "" {
+		return "", err
+	}
+	if cd := os.Getenv("PACKER_CONFIG_DIR"); cd != "" {
+		log.Printf("Detected config directory from env var: %s", cd)
+		dir = filepath.Join(cd, defaultConfigDir)
+	} else if hasDefaultConfigFileLocation(homedir) {
+		dir = filepath.Join(homedir, defaultConfigDir)
+		log.Printf("Old default config directory found: %s", dir)
+	} else if xdgConfigHome := os.Getenv("XDG_CONFIG_HOME"); xdgConfigHome != "" {
+		log.Printf("Detected xdg config directory from env var: %s", xdgConfigHome)
+		dir = xdgConfigHome
+	} else {
+		dir = filepath.Join(homedir, ".config")
+	}
+
+	return dir, nil
+}
+
+func hasDefaultConfigFileLocation(homedir string) bool {
+	if _, err := os.Stat(filepath.Join(homedir, defaultConfigDir)); err != nil {
+		return false
+	}
+	return true
+}

pathing/config_file_windows.go

@@ -2,7 +2,29 @@
 
 package pathing
 
+import (
+	"log"
+	"os"
+	"path/filepath"
+)
+
 const (
 	defaultConfigFile = "packer.config"
 	defaultConfigDir  = "packer.d"
 )
+
+func configDir() (path string, err error) {
+	var dir string
+	if cd := os.Getenv("PACKER_CONFIG_DIR"); cd != "" {
+		log.Printf("Detected config directory from env var: %s", cd)
+		dir = filepath.Join(cd, defaultConfigDir)
+	} else {
+		homedir, err := homeDir()
+		if err != nil {
+			return "", err
+		}
+		dir = filepath.Join(homedir, defaultConfigDir)
+	}
+
+	return dir, nil
+}