@ -721,7 +721,13 @@ func (c *Command) ExecuteC() (cmd *Command, err error) {
 | 
				
			|||||||
func (c *Command) initHelpFlag() {
 | 
					func (c *Command) initHelpFlag() {
 | 
				
			||||||
	c.mergePersistentFlags()
 | 
						c.mergePersistentFlags()
 | 
				
			||||||
	if c.Flags().Lookup("help") == nil {
 | 
						if c.Flags().Lookup("help") == nil {
 | 
				
			||||||
		c.Flags().BoolP("help", "h", false, "help for "+c.Name())
 | 
							usage := "help for "
 | 
				
			||||||
 | 
							if c.Name() == "" {
 | 
				
			||||||
 | 
								usage += "this command"
 | 
				
			||||||
 | 
							} else {
 | 
				
			||||||
 | 
								usage += c.Name()
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
							c.Flags().BoolP("help", "h", false, usage)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -745,6 +751,7 @@ func (c *Command) initHelpCmd() {
 | 
				
			|||||||
					c.Printf("Unknown help topic %#q\n", args)
 | 
										c.Printf("Unknown help topic %#q\n", args)
 | 
				
			||||||
					c.Root().Usage()
 | 
										c.Root().Usage()
 | 
				
			||||||
				} else {
 | 
									} else {
 | 
				
			||||||
 | 
										cmd.initHelpFlag() // make possible 'help' flag to be shown
 | 
				
			||||||
					cmd.Help()
 | 
										cmd.Help()
 | 
				
			||||||
				}
 | 
									}
 | 
				
			||||||
			},
 | 
								},
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user