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

jszwedko's suggestion done

Browse Source
This commit is contained in:
Dario Castañé
2015-01-10 00:44:37 +01:00
parent 4e3a83b43e
commit 4ab12cd639
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app.go
View File

@@ -78,6 +78,7 @@ func NewApp() *App {
// Entry point to the cli app. Parses the arguments slice and routes to the proper flag/args combination // Entry point to the cli app. Parses the arguments slice and routes to the proper flag/args combination
func (a *App) Run(arguments []string) error { func (a *App) Run(arguments []string) error {
var err error
if HelpPrinter == nil { if HelpPrinter == nil {
defer func() { defer func() {
HelpPrinter = nil HelpPrinter = nil
@@ -146,11 +147,10 @@ func (a *App) Run(arguments []string) error {
if a.After != nil { if a.After != nil {
defer func() { defer func() {
aferr := a.After(context) // err is always nil here.
// check Action error to avoid shadowing // There is a check to see if it is non-nil
if err == nil { // just few lines before.
err = aferr err = a.After(context)
}
}() }()
} }
@@ -184,7 +184,8 @@ func (a *App) RunAndExitOnError() {
} }
// Invokes the subcommand given the context, parses ctx.Args() to generate command-specific flags // Invokes the subcommand given the context, parses ctx.Args() to generate command-specific flags
func (a *App) RunAsSubcommand(ctx *Context) (err error) { func (a *App) RunAsSubcommand(ctx *Context) error {
var err error
// append help to commands // append help to commands
if len(a.Commands) > 0 { if len(a.Commands) > 0 {
if a.Command(helpCommand.Name) == nil && !a.HideHelp { if a.Command(helpCommand.Name) == nil && !a.HideHelp {
@@ -240,11 +241,10 @@ func (a *App) RunAsSubcommand(ctx *Context) (err error) {
if a.After != nil { if a.After != nil {
defer func() { defer func() {
aferr := a.After(context) // err is always nil here.
// check Action error to avoid shadowing // There is a check to see if it is non-nil
if err == nil { // just few lines before.
err = aferr err = a.After(context)
}
}() }()
} }