cmd/ipfs2: Display subcommand help text on parse error

1cb94a12 · Matt Bell · Juan Batiz-Benet · 48c108d5 · 1cb94a12
Commit 1cb94a12 authored Nov 04, 2014 by Matt Bell Committed by Juan Batiz-Benet Nov 14, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

cmd/ipfs2/main.go cmd/ipfs2/main.go +8 -2

No files found.
--- a/cmd/ipfs2/main.go
+++ b/cmd/ipfs2/main.go
@@ -40,10 +40,16 @@ func main() {
 }

 func createRequest(args []string) (cmds.Request, *cmds.Command) {
-	req, root, err := cmdsCli.Parse(args, Root, commands.Root)
+	req, root, cmd, err := cmdsCli.Parse(args, Root, commands.Root)
 	if err != nil {
 		fmt.Println(err)
-		fmt.Println(Root.Help)
+		if cmd != nil {
+			if cmd.Help != "" {
+				fmt.Println(cmd.Help)
+			}
+		} else {
+			fmt.Println(Root.Help)
+		}
 		os.Exit(1)
 	}