glenux-archive/spf13--cobra
1
0
Fork 0
mirror of https://github.com/spf13/cobra synced 2024-11-24 22:57:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix help command: use PersistentPreRunE instead of PersistentPreRun

Browse source
This commit is contained in:
Jun Nishimura 2023-07-14 23:50:21 +09:00
parent 3bb59c6775
commit b370e7b9af
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
command.go
View file

@ -1209,7 +1209,7 @@ Simply type ` + c.Name() + ` help [path to command] for full details.`,
} }
return completions, ShellCompDirectiveNoFileComp return completions, ShellCompDirectiveNoFileComp
}, },
PersistentPreRun: func(cmd *Command, args []string) { PersistentPreRunE: func(cmd *Command, args []string) error {
cmd.Flags().VisitAll(func(pflag *flag.Flag) { cmd.Flags().VisitAll(func(pflag *flag.Flag) {
requiredAnnotation, found := pflag.Annotations[BashCompOneRequiredFlag] requiredAnnotation, found := pflag.Annotations[BashCompOneRequiredFlag]
if found && requiredAnnotation[0] == "true" { if found && requiredAnnotation[0] == "true" {
@ -1219,7 +1219,12 @@ Simply type ` + c.Name() + ` help [path to command] for full details.`,
}) })
// Adding PersistentPreRun on sub-commands prevents root's PersistentPreRun from being called. // Adding PersistentPreRun on sub-commands prevents root's PersistentPreRun from being called.
// So it is intentionally called here. // So it is intentionally called here.
cmd.Root().PersistentPreRun(cmd.Root(), args) if cmd.Root().PersistentPreRunE != nil {
return cmd.Root().PersistentPreRunE(cmd, args)
} else if cmd.Root().PersistentPreRun != nil {
cmd.Root().PersistentPreRun(cmd, args)
}
return nil
}, },
Run: func(c *Command, args []string) { Run: func(c *Command, args []string) {
cmd, _, e := c.Root().Find(args) cmd, _, e := c.Root().Find(args)