Update docs and make code a bit more explicit; fix a lint

Signed-off-by: Alexander Nesterenko <nestorf250@gmail.com>
pull/5166/head
Alexander Nesterenko 7 years ago
parent 8723b56965
commit a9016be0e8

@ -47,7 +47,7 @@ Environment:
$HELM_HOME set an alternative location for Helm files. By default, these are stored in $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 $XDG_CONFIG_DIR/helm ($HOME/.config/helm on Linux, %APPDATA%\helm on Windows
and $HOME/Library/Preferences/helm on macOS). 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_DRIVER set the backend storage driver. Values are: configmap, secret, memory
$HELM_NO_PLUGINS disable plugins. Set HELM_NO_PLUGINS=1 to disable plugins. $HELM_NO_PLUGINS disable plugins. Set HELM_NO_PLUGINS=1 to disable plugins.
$KUBECONFIG set an alternative Kubernetes configuration file (default $HOME/.kube/config) $KUBECONFIG set an alternative Kubernetes configuration file (default $HOME/.kube/config)

@ -63,8 +63,8 @@ func DirExists(path string) bool {
// GetDefaultConfigHome determines the configuration home dir. // GetDefaultConfigHome determines the configuration home dir.
func GetDefaultConfigHome() string { func GetDefaultConfigHome() string {
if ConfigPath.xdgHomeExists() || !ConfigPath.basicHomeExists() { if !ConfigPath.xdgHomeExists() && ConfigPath.basicHomeExists() {
return defaultHelmHome return oldDefaultHelmHome
} }
return oldDefaultHelmHome return defaultHelmHome
} }

@ -26,6 +26,7 @@ import (
"os" "os"
"github.com/spf13/pflag" "github.com/spf13/pflag"
"k8s.io/helm/pkg/helm/helmpath" "k8s.io/helm/pkg/helm/helmpath"
) )

Loading…
Cancel
Save