Skip to content

Commit

Permalink
Merge pull request #3258 from darkedges/master
Browse files Browse the repository at this point in the history
When copying assets from .minikube/files on windows, directories get squashed during transfer. ie /etc/ssl/certs/test.pem becomes ~minikube/etcsslcerts/test.pem. This pull request ensures any window style directories are converted into unix style.
  • Loading branch information
tstromberg authored Feb 8, 2019
2 parents 6762789 + aca02f4 commit 91be19c
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion pkg/minikube/assets/addons.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package assets
import (
"fmt"
"os"
"path"
"path/filepath"
"strconv"

Expand Down Expand Up @@ -307,7 +308,8 @@ func addMinikubeDirToAssets(basedir, vmpath string, assets *[]CopyableFile) erro
return errors.Wrap(err, "generating relative path")
}
rPath = filepath.Dir(rPath)
vmpath = filepath.Join("/", rPath)
rPath = filepath.ToSlash(rPath)
vmpath = path.Join("/", rPath)
}
permString := fmt.Sprintf("%o", info.Mode().Perm())
// The conversion will strip the leading 0 if present, so add it back
Expand Down

0 comments on commit 91be19c

Please sign in to comment.