make HELM_HOME portable

allow cacheFile to be relative for local index
uses a symlink with a relative path on unix

final piece of https://github.com/kubernetes/helm/pull/3327

Signed-off-by: Christopher A. Stelma <stelminator@gmail.com>
pull/5422/head
Christopher A. Stelma 8 years ago committed by Christopher A. Stelma
parent 8cbbc580ec
commit 7c49b7ba69

@ -96,7 +96,11 @@ func ensureDefaultRepos(home helmpath.Home, out io.Writer, skipRefresh bool, set
if err != nil { if err != nil {
return err return err
} }
lr, err := initLocalRepo(home.LocalRepository(LocalRepositoryIndexFile), home.CacheIndex("local"), home, out, settings, localRepositoryURL) lif, err := filepath.Rel(home.Cache(), home.CacheIndex("local"))
if err != nil {
return err
}
lr, err := initLocalRepo(home.LocalRepository(LocalRepositoryIndexFile), lif, home, out, settings, localRepositoryURL)
if err != nil { if err != nil {
return err return err
} }

@ -20,10 +20,15 @@ package installer // import "k8s.io/helm/cmd/helm/installer"
import ( import (
"os" "os"
"path/filepath"
"k8s.io/helm/pkg/helm/helmpath" "k8s.io/helm/pkg/helm/helmpath"
) )
func createLink(indexFile, cacheFile string, home helmpath.Home) error { func createLink(indexFile, cacheFile string, home helmpath.Home) error {
return os.Symlink(indexFile, cacheFile) fp, err := filepath.Rel(home.Cache(), indexFile)
if err != nil {
return err
}
return os.Symlink(fp, filepath.Join(home.Cache(), cacheFile))
} }

@ -20,10 +20,11 @@ package installer // import "k8s.io/helm/cmd/helm/installer"
import ( import (
"os" "os"
"path/filepath"
"k8s.io/helm/pkg/helm/helmpath" "k8s.io/helm/pkg/helm/helmpath"
) )
func createLink(indexFile, cacheFile string, home helmpath.Home) error { func createLink(indexFile, cacheFile string, home helmpath.Home) error {
return os.Link(indexFile, cacheFile) return os.Link(indexFile, filepath.Join(home.Cache(), cacheFile))
} }

Loading…
Cancel
Save