vinchent/cobra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Persistent-Run function propagation

Browse Source
This commit is contained in:
Anastasis Andronidis 2015-05-04 03:36:05 +02:00
parent 3ee9552eeb
commit 42e6ce397f
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
command.go
View File

@ -463,8 +463,11 @@ func (c *Command) execute(a []string) (err error) {
c.preRun() c.preRun()
argWoFlags := c.Flags().Args() argWoFlags := c.Flags().Args()
if c.PersistentPreRun != nil { for p := c; p != nil; p = p.Parent() {
c.PersistentPreRun(c, argWoFlags) if p.PersistentPreRun != nil {
p.PersistentPreRun(c, argWoFlags)
break
}
} }
if c.PreRun != nil { if c.PreRun != nil {
c.PreRun(c, argWoFlags) c.PreRun(c, argWoFlags)
@ -475,8 +478,11 @@ func (c *Command) execute(a []string) (err error) {
if c.PostRun != nil { if c.PostRun != nil {
c.PostRun(c, argWoFlags) c.PostRun(c, argWoFlags)
} }
if c.PersistentPostRun != nil { for p := c; p != nil; p = p.Parent() {
c.PersistentPostRun(c, argWoFlags) if p.PersistentPostRun != nil {
p.PersistentPostRun(c, argWoFlags)
break
}
} }
return nil return nil
@ -601,14 +607,6 @@ func (c *Command) AddCommand(cmds ...*Command) {
c.commandsMaxNameLen = nameLen c.commandsMaxNameLen = nameLen
} }
c.commands = append(c.commands, x) c.commands = append(c.commands, x)
// Pass on peristent pre/post functions to children
if x.PersistentPreRun == nil {
x.PersistentPreRun = c.PersistentPreRun
}
if x.PersistentPostRun == nil {
x.PersistentPostRun = c.PersistentPostRun
}
} }
} }