Fix:(issue_1548) Check root before run default cmd

This commit is contained in:
devinnwang 2022-10-25 14:14:04 +08:00
parent 7732a512f9
commit ba96587f56
2 changed files with 31 additions and 1 deletions

View File

@ -252,7 +252,7 @@ func (c *Command) Run(cCtx *Context, arguments ...string) (err error) {
}
}
}
} else if cCtx.App.DefaultCommand != "" {
} else if c.isRoot && cCtx.App.DefaultCommand != "" {
if dc := cCtx.App.Command(cCtx.App.DefaultCommand); dc != c {
cmd = dc
}

View File

@ -485,3 +485,33 @@ func TestCommand_VisibleFlagCategories(t *testing.T) {
t.Errorf("unexpected flag %+v", fl.Names())
}
}
func TestCommand_RunSubcommandWithDefault(t *testing.T) {
app := &App{
Version: "some version",
Name: "app",
DefaultCommand: "foo",
Commands: []*Command{
{
Name: "foo",
Action: func(ctx *Context) error {
return errors.New("should not run this subcommand")
},
},
{
Name: "bar",
Usage: "this is for testing",
Subcommands: []*Command{{}}, // some subcommand
Action: func(*Context) error {
return nil
},
},
},
}
err := app.Run([]string{"app", "bar"})
expect(t, err, nil)
err = app.Run([]string{"app"})
expect(t, err, errors.New("should not run this subcommand"))
}