Default cache to "packer_cache" in CWD

8b728794 · Mitchell Hashimoto · cea6f90f · 8b728794
Commit 8b728794 authored Jun 20, 2013 by Mitchell Hashimoto
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 8 deletions

packer.go packer.go +10 -8

No files found.
--- a/packer.go
+++ b/packer.go
@@ -36,17 +36,19 @@ func main() {
 	defer plugin.CleanupClients()
-	var cache packer.Cache
+	cacheDir := os.Getenv("PACKER_CACHE_DIR")
-	if cacheDir := os.Getenv("PACKER_CACHE_DIR"); cacheDir != "" {
+	if cacheDir == "" {
-		if err := os.MkdirAll(cacheDir, 0755); err != nil {
+		cacheDir = "packer_cache"
-			fmt.Fprintf(os.Stderr, "Error preparing cache directory: \n\n%s\n", err)
+	}
-			os.Exit(1)
-		}
-		log.Printf("Setting cache directory: %s", cacheDir)
+	if err := os.MkdirAll(cacheDir, 0755); err != nil {
-		cache = &packer.FileCache{CacheDir: cacheDir}
+		fmt.Fprintf(os.Stderr, "Error preparing cache directory: \n\n%s\n", err)
+		os.Exit(1)
 	}
+	log.Printf("Setting cache directory: %s", cacheDir)
+	cache := &packer.FileCache{CacheDir: cacheDir}
 	envConfig := packer.DefaultEnvironmentConfig()
 	envConfig.Cache = cache
 	envConfig.Commands = config.CommandNames()