Merge pull request #8531 from jtzwu/master

Do not output usage hint when shell=none.
kubernetes · Jun 23, 2020 · f52a682 · f52a682
2 parents 126b8cf + e1a7b22
commit f52a682
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/pkg/minikube/shell/shell.go b/pkg/minikube/shell/shell.go
@@ -124,10 +124,7 @@ REM @FOR /f "tokens=*" %%i IN ('%s') DO @%%i
 		unsetSuffix:    "\n",
 		unsetDelimiter: "",
 		usageHint: func(s ...interface{}) string {
-			return fmt.Sprintf(`
-# %s
-# eval $(%s)
-`, s...)
+			return ""
 		},
 	},
 }

diff --git a/pkg/minikube/shell/shell_test.go b/pkg/minikube/shell/shell_test.go
@@ -40,8 +40,7 @@ func TestGenerateUsageHint(t *testing.T) {
 ;; (with-temp-buffer (shell-command "bar" (current-buffer)) (eval-buffer))`},
 		{EnvConfig{"fish"}, `# foo
 # bar | source`},
-		{EnvConfig{"none"}, `# foo
-# eval $(bar)`},
+		{EnvConfig{"none"}, ``},
 	}
 	for _, tc := range testCases {
 		tc := tc