Merge pull request kubernetes#1792 from r2d4/docker-env-helper

Add 'none' shell for docker-env output
betabrand · Aug 7, 2017 · 55fb939 · 55fb939
2 parents 2deea5f + a02541d
commit 55fb939
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/cmd/minikube/cmd/env.go b/cmd/minikube/cmd/env.go
@@ -79,6 +79,10 @@ const (
 	bashUnsetPfx   = "unset "
 	bashUnsetSfx   = "\n"
 	bashUnsetDelim = ""
+
+	nonePfx   = ""
+	noneSfx   = "\n"
+	noneDelim = "="
 )
 
 var usageHintMap = map[string]string{
@@ -204,6 +208,11 @@ func shellCfgSet(api libmachine.API) (*ShellConfig, error) {
 		shellCfg.Prefix = emacsSetPfx
 		shellCfg.Suffix = emacsSetSfx
 		shellCfg.Delimiter = emacsSetDelim
+	case "none":
+		shellCfg.Prefix = nonePfx
+		shellCfg.Suffix = noneSfx
+		shellCfg.Delimiter = noneDelim
+		shellCfg.UsageHint = ""
 	default:
 		shellCfg.Prefix = bashSetPfx
 		shellCfg.Suffix = bashSetSfx
@@ -245,6 +254,11 @@ func shellCfgUnset() (*ShellConfig, error) {
 		shellCfg.Prefix = emacsUnsetPfx
 		shellCfg.Suffix = emacsUnsetSfx
 		shellCfg.Delimiter = emacsUnsetDelim
+	case "none":
+		shellCfg.Prefix = nonePfx
+		shellCfg.Suffix = noneSfx
+		shellCfg.Delimiter = noneDelim
+		shellCfg.UsageHint = ""
 	default:
 		shellCfg.Prefix = bashUnsetPfx
 		shellCfg.Suffix = bashUnsetSfx