Use strconv.ParseBool to parse descriptions state from env

This commit is contained in:
Ville Skyttä 2023-12-11 18:04:40 +02:00
parent 7aa559d693
commit 138b0ab964
2 changed files with 8 additions and 3 deletions

View file

@ -18,6 +18,7 @@ import (
"fmt" "fmt"
"os" "os"
"regexp" "regexp"
"strconv"
"strings" "strings"
"sync" "sync"
@ -212,7 +213,12 @@ func (c *Command) initCompleteCmd(args []string) {
// 2- Even without completions, we need to print the directive // 2- Even without completions, we need to print the directive
} }
noDescriptions := cmd.CalledAs() == ShellCompNoDescRequestCmd || getEnvConfig(cmd, configEnvVarSuffixDescriptions) == configEnvVarDescriptionsOff noDescriptions := cmd.CalledAs() == ShellCompNoDescRequestCmd
if !noDescriptions {
if doDescriptions, err := strconv.ParseBool(getEnvConfig(cmd, configEnvVarSuffixDescriptions)); err == nil {
noDescriptions = !doDescriptions
}
}
noActiveHelp := GetActiveHelpConfig(finalCmd) == activeHelpGlobalDisable noActiveHelp := GetActiveHelpConfig(finalCmd) == activeHelpGlobalDisable
out := finalCmd.OutOrStdout() out := finalCmd.OutOrStdout()
for _, comp := range completions { for _, comp := range completions {
@ -905,7 +911,6 @@ func CompErrorln(msg string) {
const ( const (
configEnvVarGlobalPrefix = "COBRA" configEnvVarGlobalPrefix = "COBRA"
configEnvVarSuffixDescriptions = "COMPLETION_DESCRIPTIONS" configEnvVarSuffixDescriptions = "COMPLETION_DESCRIPTIONS"
configEnvVarDescriptionsOff = "off"
) )
var configEnvVarPrefixSubstRegexp = regexp.MustCompile(`[^A-Z0-9_]`) var configEnvVarPrefixSubstRegexp = regexp.MustCompile(`[^A-Z0-9_]`)

View file

@ -394,7 +394,7 @@ $ helm completion [tab][tab]
bash fish powershell zsh bash fish powershell zsh
``` ```
Setting the `<PROGRAM>_COMPLETION_DESCRIPTIONS` environment variable (falling back to `COBRA_COMPLETION_DESCRIPTIONS` if empty or not set) to `off` achieves the same. `<PROGRAM>` is the name of your program with all non-ASCII-alphanumeric characters replaced by `_`. Setting the `<PROGRAM>_COMPLETION_DESCRIPTIONS` environment variable (falling back to `COBRA_COMPLETION_DESCRIPTIONS` if empty or not set) to a [falsey value](https://pkg.go.dev/strconv#ParseBool) achieves the same. `<PROGRAM>` is the name of your program with all non-ASCII-alphanumeric characters replaced by `_`.
## Bash completions ## Bash completions