Updating default config and cache directory for unix systems

Author: teddylear

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,20 @@
+// +build darwin freebsd linux netbsd openbsd solaris
+
+package packer
+
+import (
+	"os"
+	"path/filepath"
+)
+
+func getDefaultCacheDir() string {
+	var defaultConfigFileDir string
+
+	if xdgConfigHome := os.Getenv("XDG_CONFIG_HOME"); xdgConfigHome != "" {
+		defaultConfigFileDir = xdgConfigHome
+	} else {
+		defaultConfigFileDir = filepath.Join(os.Getenv("HOME"), "cache")
+	}
+
+	return filepath.Join(defaultConfigFileDir, "packer")
+}

packer/cache_config_windows.go

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

packer/cache_test.go

@@ -67,10 +67,11 @@ func configFile() (string, error) {
 		}
 		dir = homedir
 	}
+
 	return filepath.Join(dir, defaultConfigFile), nil
 }
 
-func configDir() (string, error) {
+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)
@@ -83,7 +84,7 @@ func configDir() (string, error) {
 		dir = homedir
 	}
 
-	return filepath.Join(dir, defaultConfigDir), nil
+	return filepath.Join(dir, getDefaultConfigDir()), nil
 }
 
 // Given a path, check to see if it's using ~ to reference a user directory.

pathing/config_file.go

@@ -2,7 +2,24 @@
 
 package pathing
 
+import (
+	"os"
+	"path/filepath"
+)
+
 const (
-	defaultConfigFile = ".packerconfig"
-	defaultConfigDir  = ".packer.d"
+	defaultConfigFile = "packer"
 )
+
+func getDefaultConfigDir() string {
+
+	var defaultConfigFileDir string
+
+	if xdgConfigHome := os.Getenv("XDG_CONFIG_HOME"); xdgConfigHome != "" {
+		defaultConfigFileDir = xdgConfigHome
+	} else {
+		defaultConfigFileDir = filepath.Join(os.Getenv("HOME"), "config")
+	}
+
+	return filepath.Join(defaultConfigFileDir, "packer")
+}

pathing/config_file_unix.go

@@ -4,5 +4,8 @@ package pathing
 
 const (
 	defaultConfigFile = "packer.config"
-	defaultConfigDir  = "packer.d"
 )
+
+func getDefaultConfigDir() string {
+	return "packer.d"
+}