mirror of https://github.com/spf13/cobra.git
Better error handling
This commit is contained in:
parent
36e08ffd5b
commit
a618569eea
17
cobra.go
17
cobra.go
|
@ -67,12 +67,13 @@ func (c *Commander) SetArgs(a []string) {
|
||||||
c.args = a
|
c.args = a
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Commander) Execute() {
|
func (c *Commander) Execute() (err error) {
|
||||||
if len(c.args) == 0 {
|
if len(c.args) == 0 {
|
||||||
c.execute(os.Args[1:])
|
err = c.execute(os.Args[1:])
|
||||||
} else {
|
} else {
|
||||||
c.execute(c.args)
|
err = c.execute(c.args)
|
||||||
}
|
}
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Command is just that, a command for your application.
|
// Command is just that, a command for your application.
|
||||||
|
@ -137,9 +138,13 @@ func (c *Command) execute(args []string) (err error) {
|
||||||
cmd, a, e := c.Find(args)
|
cmd, a, e := c.Find(args)
|
||||||
if e == nil {
|
if e == nil {
|
||||||
err = cmd.ParseFlags(a)
|
err = cmd.ParseFlags(a)
|
||||||
argWoFlags := cmd.Flags().Args()
|
if err != nil {
|
||||||
cmd.Run(cmd, argWoFlags)
|
return err
|
||||||
return nil
|
} else {
|
||||||
|
argWoFlags := cmd.Flags().Args()
|
||||||
|
cmd.Run(cmd, argWoFlags)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
}
|
}
|
||||||
err = e
|
err = e
|
||||||
return err
|
return err
|
||||||
|
|
Loading…
Reference in New Issue