From 89ff61a542419d411006a2d7239d407060b7972a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <git@mislav.net>
Date: Mon, 23 May 2022 19:31:58 +0200
Subject: [PATCH] Handle errors in built-in help command

---
 command.go | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/command.go b/command.go
index 37955700..5a835d70 100644
--- a/command.go
+++ b/command.go
@@ -1115,15 +1115,16 @@ Simply type ` + c.Name() + ` help [path to command] for full details.`,
 				}
 				return completions, ShellCompDirectiveNoFileComp
 			},
-			Run: func(c *Command, args []string) {
+			RunE: func(c *Command, args []string) error {
 				cmd, _, e := c.Root().Find(args)
-				if cmd == nil || e != nil {
+				if e != nil {
+					return e
+				} else if cmd == nil {
 					c.PrintErrf("Unknown help topic %#q\n", args)
-					CheckErr(c.Root().Usage())
-				} else {
-					cmd.InitDefaultHelpFlag() // make possible 'help' flag to be shown
-					CheckErr(cmd.Help())
+					return c.Root().Usage()
 				}
+				cmd.InitDefaultHelpFlag() // make possible 'help' flag to be shown
+				return cmd.Help()
 			},
 		}
 	}