From 637150577db9e8dbc6f3a918030bdc3a8d35bba0 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Mon, 22 Feb 2021 16:04:58 -0500 Subject: [PATCH] fix(cmd): Show that flags can be used for zsh/fish The "helm completion zsh" and "helm completion fish" commands accept the "--no-descriptions" flag, therefore we should not disable the addition of "[flags]" to the usage line when printing help. Signed-off-by: Marc Khouzam --- cmd/helm/completion.go | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/cmd/helm/completion.go b/cmd/helm/completion.go index f4c8a63f5..5aea0592e 100644 --- a/cmd/helm/completion.go +++ b/cmd/helm/completion.go @@ -92,12 +92,11 @@ func newCompletionCmd(out io.Writer) *cobra.Command { } zsh := &cobra.Command{ - Use: "zsh", - Short: "generate autocompletion script for zsh", - Long: zshCompDesc, - Args: require.NoArgs, - DisableFlagsInUseLine: true, - ValidArgsFunction: noCompletions, + Use: "zsh", + Short: "generate autocompletion script for zsh", + Long: zshCompDesc, + Args: require.NoArgs, + ValidArgsFunction: noCompletions, RunE: func(cmd *cobra.Command, args []string) error { return runCompletionZsh(out, cmd) }, @@ -105,12 +104,11 @@ func newCompletionCmd(out io.Writer) *cobra.Command { zsh.Flags().BoolVar(&disableCompDescriptions, noDescFlagName, false, noDescFlagText) fish := &cobra.Command{ - Use: "fish", - Short: "generate autocompletion script for fish", - Long: fishCompDesc, - Args: require.NoArgs, - DisableFlagsInUseLine: true, - ValidArgsFunction: noCompletions, + Use: "fish", + Short: "generate autocompletion script for fish", + Long: fishCompDesc, + Args: require.NoArgs, + ValidArgsFunction: noCompletions, RunE: func(cmd *cobra.Command, args []string) error { return runCompletionFish(out, cmd) },