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

Print blank lines in help and error outputs more consistently.

Browse Source
This commit is contained in:
Martin Falatic 2015-06-24 22:46:33 -07:00
parent ad480243a8
commit ee2cde7a77
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app.go
View File

@ -108,15 +108,14 @@ func (a *App) Run(arguments []string) (err error) {
fmt.Fprintln(a.Writer, nerr) fmt.Fprintln(a.Writer, nerr)
context := NewContext(a, set, nil) context := NewContext(a, set, nil)
ShowAppHelp(context) ShowAppHelp(context)
fmt.Fprintln(a.Writer)
return nerr return nerr
} }
context := NewContext(a, set, nil) context := NewContext(a, set, nil)
if err != nil { if err != nil {
fmt.Fprintf(a.Writer, "Incorrect Usage.\n\n") fmt.Fprintln(a.Writer, "Incorrect Usage.")
ShowAppHelp(context)
fmt.Fprintln(a.Writer) fmt.Fprintln(a.Writer)
ShowAppHelp(context)
return err return err
} }
@ -200,17 +199,18 @@ func (a *App) RunAsSubcommand(ctx *Context) (err error) {
if nerr != nil { if nerr != nil {
fmt.Fprintln(a.Writer, nerr) fmt.Fprintln(a.Writer, nerr)
fmt.Fprintln(a.Writer)
if len(a.Commands) > 0 { if len(a.Commands) > 0 {
ShowSubcommandHelp(context) ShowSubcommandHelp(context)
} else { } else {
ShowCommandHelp(ctx, context.Args().First()) ShowCommandHelp(ctx, context.Args().First())
} }
fmt.Fprintln(a.Writer)
return nerr return nerr
} }
if err != nil { if err != nil {
fmt.Fprintf(a.Writer, "Incorrect Usage.\n\n") fmt.Fprintln(a.Writer, "Incorrect Usage.")
fmt.Fprintln(a.Writer)
ShowSubcommandHelp(context) ShowSubcommandHelp(context)
return err return err
} }

5
command.go
View File

@ -91,9 +91,9 @@ func (c Command) Run(ctx *Context) error {
} }
if err != nil { if err != nil {
fmt.Fprint(ctx.App.Writer, "Incorrect Usage.\n\n") fmt.Fprintln(ctx.App.Writer, "Incorrect Usage.")
ShowCommandHelp(ctx, c.Name)
fmt.Fprintln(ctx.App.Writer) fmt.Fprintln(ctx.App.Writer)
ShowCommandHelp(ctx, c.Name)
return err return err
} }
@ -102,7 +102,6 @@ func (c Command) Run(ctx *Context) error {
fmt.Fprintln(ctx.App.Writer, nerr) fmt.Fprintln(ctx.App.Writer, nerr)
fmt.Fprintln(ctx.App.Writer) fmt.Fprintln(ctx.App.Writer)
ShowCommandHelp(ctx, c.Name) ShowCommandHelp(ctx, c.Name)
fmt.Fprintln(ctx.App.Writer)
return nerr return nerr
} }
context := NewContext(ctx.App, set, ctx) context := NewContext(ctx.App, set, ctx)