Skip to content

Commit f52a682

Browse files
authored
Merge pull request #8531 from jtzwu/master
Do not output usage hint when shell=none.
2 parents 126b8cf + e1a7b22 commit f52a682

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

pkg/minikube/shell/shell.go

+1-4
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,7 @@ REM @FOR /f "tokens=*" %%i IN ('%s') DO @%%i
124124
unsetSuffix: "\n",
125125
unsetDelimiter: "",
126126
usageHint: func(s ...interface{}) string {
127-
return fmt.Sprintf(`
128-
# %s
129-
# eval $(%s)
130-
`, s...)
127+
return ""
131128
},
132129
},
133130
}

pkg/minikube/shell/shell_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ func TestGenerateUsageHint(t *testing.T) {
4040
;; (with-temp-buffer (shell-command "bar" (current-buffer)) (eval-buffer))`},
4141
{EnvConfig{"fish"}, `# foo
4242
# bar | source`},
43-
{EnvConfig{"none"}, `# foo
44-
# eval $(bar)`},
43+
{EnvConfig{"none"}, ``},
4544
}
4645
for _, tc := range testCases {
4746
tc := tc

0 commit comments

Comments
 (0)