From a9016be0e8ec66da5bfca519ab9a2cf130ad08fb Mon Sep 17 00:00:00 2001 From: Alexander Nesterenko Date: Tue, 12 Mar 2019 16:00:41 +0200 Subject: [PATCH] Update docs and make code a bit more explicit; fix a lint Signed-off-by: Alexander Nesterenko --- cmd/helm/root.go | 2 +- pkg/helm/environment/default_home_dir.go | 6 +++--- pkg/helm/environment/environment.go | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmd/helm/root.go b/cmd/helm/root.go index c691f00bb..61289a00a 100644 --- a/cmd/helm/root.go +++ b/cmd/helm/root.go @@ -47,7 +47,7 @@ Environment: $HELM_HOME set an alternative location for Helm files. By default, these are stored in $XDG_CONFIG_DIR/helm ($HOME/.config/helm on Linux, %APPDATA%\helm on Windows and $HOME/Library/Preferences/helm on macOS). - NOTE: if default does not exist but $HOME/.helm does, the last will be used. + NOTE: if the default does not exist but $HOME/.helm does, the latter will be used. $HELM_DRIVER set the backend storage driver. Values are: configmap, secret, memory $HELM_NO_PLUGINS disable plugins. Set HELM_NO_PLUGINS=1 to disable plugins. $KUBECONFIG set an alternative Kubernetes configuration file (default $HOME/.kube/config) diff --git a/pkg/helm/environment/default_home_dir.go b/pkg/helm/environment/default_home_dir.go index a3209aba4..e1232a9c7 100644 --- a/pkg/helm/environment/default_home_dir.go +++ b/pkg/helm/environment/default_home_dir.go @@ -63,8 +63,8 @@ func DirExists(path string) bool { // GetDefaultConfigHome determines the configuration home dir. func GetDefaultConfigHome() string { - if ConfigPath.xdgHomeExists() || !ConfigPath.basicHomeExists() { - return defaultHelmHome + if !ConfigPath.xdgHomeExists() && ConfigPath.basicHomeExists() { + return oldDefaultHelmHome } - return oldDefaultHelmHome + return defaultHelmHome } diff --git a/pkg/helm/environment/environment.go b/pkg/helm/environment/environment.go index 91b7ececb..32658341d 100644 --- a/pkg/helm/environment/environment.go +++ b/pkg/helm/environment/environment.go @@ -26,6 +26,7 @@ import ( "os" "github.com/spf13/pflag" + "k8s.io/helm/pkg/helm/helmpath" )