From b08de8e0f5ae651cbdcade2ca2cbe798296a9b18 Mon Sep 17 00:00:00 2001 From: tstromberg Date: Wed, 28 Aug 2019 13:13:52 -0700 Subject: [PATCH] More filepath -> path --- pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 3 ++- pkg/minikube/machine/cache_binaries.go | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index 532cd1ab4a..11f420ea48 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -20,10 +20,11 @@ import ( "bytes" "crypto/tls" - // WARNING: Do not use filepath here unless you want bizarre paths to be used in Windows "fmt" "net" "net/http" + + // WARNING: Do not use path/filepath in this package unless you want bizarre Windows paths "path" "runtime" "strings" diff --git a/pkg/minikube/machine/cache_binaries.go b/pkg/minikube/machine/cache_binaries.go index 8dd2c03ff4..a3d1e87ed7 100644 --- a/pkg/minikube/machine/cache_binaries.go +++ b/pkg/minikube/machine/cache_binaries.go @@ -20,7 +20,6 @@ import ( "crypto" "os" "path" - "path/filepath" "runtime" "github.com/golang/glog" @@ -93,7 +92,7 @@ func CacheBinary(binary, version, osName, archName string) (string, error) { // CopyBinary copies a locally cached binary to the guest VM func CopyBinary(cr command.Runner, src string, dest string) error { - f, err := assets.NewFileAsset(src, filepath.Dir(dest), filepath.Base(dest), "0755") + f, err := assets.NewFileAsset(src, path.Dir(dest), path.Base(dest), "0755") if err != nil { return errors.Wrap(err, "new file asset") }