allow overriding help name

This commit is contained in:
Tristan Zajonc 2015-08-12 21:58:25 -07:00
parent aced6e8739
commit cc46ca1020
2 changed files with 12 additions and 3 deletions

8
app.go
View File

@ -89,7 +89,9 @@ func (a *App) Run(arguments []string) (err error) {
newCmds := []Command{} newCmds := []Command{}
for _, c := range a.Commands { for _, c := range a.Commands {
c.HelpName = fmt.Sprintf("%s %s", a.HelpName, c.Name) if c.HelpName == "" {
c.HelpName = fmt.Sprintf("%s %s", a.HelpName, c.Name)
}
newCmds = append(newCmds, c) newCmds = append(newCmds, c)
} }
a.Commands = newCmds a.Commands = newCmds
@ -199,7 +201,9 @@ func (a *App) RunAsSubcommand(ctx *Context) (err error) {
newCmds := []Command{} newCmds := []Command{}
for _, c := range a.Commands { for _, c := range a.Commands {
c.HelpName = fmt.Sprintf("%s %s", a.HelpName, c.Name) if c.HelpName == "" {
c.HelpName = fmt.Sprintf("%s %s", a.HelpName, c.Name)
}
newCmds = append(newCmds, c) newCmds = append(newCmds, c)
} }
a.Commands = newCmds a.Commands = newCmds

View File

@ -157,7 +157,12 @@ func (c Command) startApp(ctx *Context) error {
// set the name and usage // set the name and usage
app.Name = fmt.Sprintf("%s %s", ctx.App.Name, c.Name) app.Name = fmt.Sprintf("%s %s", ctx.App.Name, c.Name)
app.HelpName = fmt.Sprintf("%s %s", ctx.App.Name, c.Name) if c.HelpName == "" {
app.HelpName = c.HelpName
} else {
app.HelpName = fmt.Sprintf("%s %s", ctx.App.Name, c.Name)
}
if c.Description != "" { if c.Description != "" {
app.Usage = c.Description app.Usage = c.Description
} else { } else {