Merge pull request #3802 from ActiveState/mitchell/cp-1289-2

mitchell-as · web-flow · commit c97849196140 · 2026-01-06T13:32:51.000-05:00
Merge v0.48.1-RC2 into master.
diff --git a/internal/installation/storage/storage.go b/internal/installation/storage/storage.go
@@ -105,7 +105,13 @@ func CachePath() string {
 		return path
 	}
 
-	return filepath.Join(BaseCachePath(), relativeCachePath())
+	cachePath = filepath.Join(BaseCachePath(), relativeCachePath())
+	if runtime.GOOS == "windows" {
+		// Explicitly append "cache" dir as the cachedir on Windows.
+		// It is the same as the local appdata dir (conflicts with config)
+		cachePath = filepath.Join(cachePath, "cache")
+	}
+	return cachePath
 }
 
 func GlobalBinDir() string {
diff --git a/internal/installation/storage/storage_windows.go b/internal/installation/storage/storage_windows.go
@@ -18,5 +18,5 @@ func BaseCachePath() string {
 		return cache
 	}
 
-	return filepath.Join(homeDir, "AppData", "Local", "cache")
+	return filepath.Join(homeDir, "AppData", "Local")
 }

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,13 @@ func CachePath() string {`
`105`	`105`	`return path`
`106`	`106`	`}`
`107`	`107`
`108`		`- return filepath.Join(BaseCachePath(), relativeCachePath())`
	`108`	`+ cachePath = filepath.Join(BaseCachePath(), relativeCachePath())`
	`109`	`+ if runtime.GOOS == "windows" {`
	`110`	`+ // Explicitly append "cache" dir as the cachedir on Windows.`
	`111`	`+ // It is the same as the local appdata dir (conflicts with config)`
	`112`	`+ cachePath = filepath.Join(cachePath, "cache")`
	`113`	`+ }`
	`114`	`+ return cachePath`
`109`	`115`	`}`
`110`	`116`
`111`	`117`	`func GlobalBinDir() string {`
Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,5 @@ func BaseCachePath() string {`
`18`	`18`	`return cache`
`19`	`19`	`}`
`20`	`20`
`21`		`- return filepath.Join(homeDir, "AppData", "Local", "cache")`
	`21`	`+ return filepath.Join(homeDir, "AppData", "Local")`
`22`	`22`	`}`