Skip to content

Commit d6a70e0

Browse files
committed
localpath: early normalize MINIKUBE_HOME in MiniPath
1 parent 8b7071e commit d6a70e0

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

pkg/minikube/localpath/localpath.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,15 @@ func ConfigFile() string {
4444
func MiniPath() string {
4545
minikubeHomeEnv := os.Getenv(MinikubeHome)
4646
if minikubeHomeEnv == "" {
47-
return filepath.Join(homedir.HomeDir(), ".minikube")
47+
return filepath.Join(filepath.Clean(homedir.HomeDir()), ".minikube")
4848
}
49-
if filepath.Base(minikubeHomeEnv) == ".minikube" {
50-
// Normalize to platform-specific separators for consistency on Windows.
51-
return filepath.Clean(filepath.FromSlash(minikubeHomeEnv))
49+
50+
norm := filepath.Clean(minikubeHomeEnv)
51+
52+
if filepath.Base(norm) == ".minikube" {
53+
return norm
5254
}
53-
return filepath.Join(minikubeHomeEnv, ".minikube")
55+
return filepath.Join(norm, ".minikube")
5456
}
5557

5658
// MakeMiniPath is a utility to calculate a relative path to our directory.

0 commit comments

Comments
 (0)