Merge pull request #6362 from adamreese/fix/xdg-override

fix(pkg/cli): do not override users xdg directories
pull/6368/head v3.0.0-beta.3
Adam Reese 5 years ago committed by GitHub
commit 5cb923eecb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -29,7 +29,6 @@ import (
"github.com/spf13/pflag"
"helm.sh/helm/pkg/helmpath"
"helm.sh/helm/pkg/helmpath/xdg"
)
// EnvSettings describes all of the environment settings.
@ -106,9 +105,6 @@ func (s *EnvSettings) setHelmEnvVars() {
"HELM_REPOSITORY_CONFIG": s.RepositoryConfig,
"HELM_REPOSITORY_CACHE": s.RepositoryCache,
"HELM_PLUGIN": s.PluginsDirectory,
xdg.CacheHomeEnvVar: helmpath.CachePath(),
xdg.ConfigHomeEnvVar: helmpath.ConfigPath(),
xdg.DataHomeEnvVar: helmpath.DataPath(),
} {
if eVal := os.Getenv(key); len(eVal) > 0 {
val = eVal

Loading…
Cancel
Save