x/urfave-cli
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #186 from nrdufour/master

Browse Source 
Fixing the issue with a command with subcommands not showing help message
This commit is contained in:
Jesse Szwedko 2015-03-09 19:37:25 -07:00
commit 3e0905345c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command.go
View File

@ -119,7 +119,7 @@ func (c Command) Run(ctx *Context) error {
// Returns true if Command.Name or Command.ShortName matches given name // Returns true if Command.Name or Command.ShortName matches given name
func (c Command) HasName(name string) bool { func (c Command) HasName(name string) bool {
return c.Name == name || c.ShortName == name return c.Name == name || (c.ShortName != "" && c.ShortName == name)
} }
func (c Command) startApp(ctx *Context) error { func (c Command) startApp(ctx *Context) error {

6
help.go
View File

@ -111,6 +111,12 @@ func DefaultAppComplete(c *Context) {
// Prints help for the given command // Prints help for the given command
func ShowCommandHelp(c *Context, command string) { func ShowCommandHelp(c *Context, command string) {
// show the subcommand help for a command with subcommands
if command == "" {
HelpPrinter(SubcommandHelpTemplate, c.App)
return
}
for _, c := range c.App.Commands { for _, c := range c.App.Commands {
if c.HasName(command) { if c.HasName(command) {
HelpPrinter(CommandHelpTemplate, c) HelpPrinter(CommandHelpTemplate, c)