mirror
/
cobra
mirror of https://github.com/spf13/cobra.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

fix trailing <nil> on help output

This commit is contained in:
spf13 2013-09-28 22:42:30 -04:00
parent c491be3a31
commit 39583856c0
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
command.go
View File

@ -176,6 +176,15 @@ func (c *Command) Usage() error {
return err return err
} }
func (c *Command) UsageString() string {
tmpOutput := c.Commander().cmdr.output
bb := new(bytes.Buffer)
c.Commander().SetOutput(bb)
c.Usage()
c.Commander().cmdr.output = tmpOutput
return bb.String()
}
// The full path to this command // The full path to this command
func (c *Command) CommandPath() string { func (c *Command) CommandPath() string {
str := c.Name() str := c.Name()

5
commander.go
View File

@ -143,8 +143,7 @@ Additional help topics: {{if gt .Commands 0 }}{{range .Commands}}{{if not .Runna
Use "{{.Commander.Name}} help [command]" for more information about that command. Use "{{.Commander.Name}} help [command]" for more information about that command.
` `
c.HelpTemplate = `{{.Name}} c.HelpTemplate = `{{.Long | trim}}
{{.Long | trim}} {{if .Runnable}}{{.UsageString}}{{end}}
{{if .Runnable}}{{.Usage}}{{end}}
` `
} }