From 0a7a8500261c7d1261c022a6d74e8d70166addf7 Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Tue, 9 Jun 2015 18:26:25 -0400
Subject: [PATCH] Make error handling more obvious

Again, the code looks a little more like a middle-schooler's code. But
that just makes it easier to understand and maintain.
---
 cobra_test.go |  2 +-
 command.go    | 31 ++++++++++++++++---------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/cobra_test.go b/cobra_test.go
index f181a079..d7dd69f6 100644
--- a/cobra_test.go
+++ b/cobra_test.go
@@ -768,7 +768,7 @@ func TestRootNoCommandHelp(t *testing.T) {
 
 func TestRootUnknownCommand(t *testing.T) {
 	r := noRRSetupTest("bogus")
-	s := "Error: unknown command \"bogus\"\nRun 'cobra-test help' for usage.\n"
+	s := "Error: unknown command \"bogus\"\nRun 'cobra-test --help' for usage.\n"
 
 	if r.Output != s {
 		t.Errorf("Unexpected response.\nExpecting to be:\n %q\nGot:\n %q\n", s, r.Output)
diff --git a/command.go b/command.go
index 4bcec0c6..0bc1693e 100644
--- a/command.go
+++ b/command.go
@@ -273,7 +273,7 @@ Additional help topics:
 {{if .HasHelpSubCommands}}{{range .Commands}}{{if and (not .Runnable) (not .Deprecated)}} {{rpad .CommandPath .CommandPathPadding}} {{.Short}}{{end}}{{end}}{{end}}{{if .HasRunnableSiblings }}{{range .Parent.Commands}}{{if and (not .Runnable) (not .Deprecated)}}{{if not (eq .Name $cmd.Name) }}
   {{rpad .CommandPath .CommandPathPadding}} {{.Short}}{{end}}{{end}}{{end}}{{end}}
 {{end}}{{ if .HasSubCommands }}
-Use "{{.Root.Name}} help [command]" for more information about a command.
+Use "{{.CommandPath}} [command] --help" for more information about a command.
 {{end}}`
 	}
 }
@@ -452,19 +452,13 @@ func (c *Command) execute(a []string) (err error) {
 	}
 
 	err = c.ParseFlags(a)
-	if err == flag.ErrHelp {
-		c.Help()
-		return nil
-	}
 	if err != nil {
-		c.Usage()
 		return err
 	}
-	// If help is called, regardless of other flags, we print that.
-	// Print help also if c.Run is nil.
+	// If help is called, regardless of other flags, return we want help
+	// Also say we need help if c.Run is nil.
 	if c.helpFlagVal || !c.Runnable() {
-		c.Help()
-		return nil
+		return flag.ErrHelp
 	}
 
 	c.preRun()
@@ -544,13 +538,20 @@ func (c *Command) Execute() (err error) {
 	}
 
 	cmd, flags, err := c.Find(args)
-	if err == nil {
-		err = cmd.execute(flags)
-	}
-
 	if err != nil {
 		c.Println("Error:", err.Error())
-		c.Printf("Run '%v help' for usage.\n", c.Root().Name())
+		c.Printf("Run '%v --help' for usage.\n", c.CommandPath())
+		return err
+	}
+
+	err = cmd.execute(flags)
+	if err != nil {
+		if err == flag.ErrHelp {
+			cmd.Help()
+			return nil
+		}
+		c.Println(cmd.UsageString())
+		c.Println("Error:", err.Error())
 	}
 
 	return