fix `ipfs help` bug

License: MIT
Signed-off-by: Kejie Zhang <601172892@qq.com>

cmd/ipfs/main.go

@@ -82,13 +82,22 @@ func mainRet() int {
 	intrh, ctx := setupInterruptHandler(ctx)
 	defer intrh.Close()
 
-	// Handle `ipfs help'
-	if len(os.Args) == 2 {
-		if os.Args[1] == "help" {
-			os.Args[1] = "-h"
-		} else if os.Args[1] == "--version" {
+	// Handle `ipfs version` or `ipfs help`
+	if len(os.Args) > 1 {
+		// Handle `ipfs --version'
+		if os.Args[1] == "--version" {
 			os.Args[1] = "version"
 		}
+
+		//Handle `ipfs help` and `ipfs help <sub-command>`
+		if os.Args[1] == "help" {
+			if len(os.Args) > 2 {
+				os.Args = append(os.Args[:1], os.Args[2:]...)
+				os.Args = append(os.Args, "-h")
+			} else {
+				os.Args[1] = "-h"
+			}
+		}
 	}
 
 	// output depends on executable name passed in os.Args

test/sharness/t0010-basic-commands.sh

@@ -51,6 +51,16 @@ test_expect_success "ipfs help output looks good" '
   test_fsh cat help.txt
 '
 
+test_expect_success "ipfs help --help succeeds" '
+  ipfs help --help >help.txt
+'
+
+test_expect_success "ipfs help --help output looks good" '
+  egrep -i "^Usage" help.txt >/dev/null &&
+  egrep "ipfs <command>" help.txt >/dev/null ||
+  test_fsh cat help.txt
+'
+
 test_expect_success "'ipfs commands' succeeds" '
   ipfs commands >commands.txt
 '

test/sharness/t0040-add-and-cat.sh

@@ -10,12 +10,21 @@ test_description="Test add and cat commands"
 
 test_add_cat_file() {
   test_expect_success "ipfs add --help works" '
-    ipfs add --help 2> add_help_err > /dev/null
+    ipfs add --help 2> add_help_err1 > /dev/null
   '
 
   test_expect_success "stdin reading message doesnt show up" '
-    test_expect_code 1 grep "ipfs: Reading from" add_help_err &&
-    test_expect_code 1 grep "send Ctrl-d to stop." add_help_err
+    test_expect_code 1 grep "ipfs: Reading from" add_help_err1 &&
+    test_expect_code 1 grep "send Ctrl-d to stop." add_help_err1
+  '
+
+  test_expect_success "ipfs help add works" '
+    ipfs help add 2> add_help_err2 > /dev/null
+  '
+
+  test_expect_success "stdin reading message doesnt show up" '
+    test_expect_code 1 grep "ipfs: Reading from" add_help_err2 &&
+    test_expect_code 1 grep "send Ctrl-d to stop." add_help_err2
   '
 
   test_expect_success "ipfs add succeeds" '
@@ -431,6 +440,15 @@ test_expect_success "'ipfs add --help' output looks good" '
   test_fsh cat actual
 '
 
+test_expect_success "'ipfs help add' succeeds" '
+  ipfs help add >actual
+'
+
+test_expect_success "'ipfs help add' output looks good" '
+  egrep "ipfs add.*<path>" actual >/dev/null ||
+  test_fsh cat actual
+'
+
 test_expect_success "'ipfs cat --help' succeeds" '
   ipfs cat --help >actual
 '
@@ -440,6 +458,15 @@ test_expect_success "'ipfs cat --help' output looks good" '
   test_fsh cat actual
 '
 
+test_expect_success "'ipfs help cat' succeeds" '
+  ipfs help cat >actual
+'
+
+test_expect_success "'ipfs help cat' output looks good" '
+  egrep "ipfs cat.*<ipfs-path>" actual >/dev/null ||
+  test_fsh cat actual
+'
+
 test_add_cat_file
 
 test_expect_success "ipfs cat succeeds with stdin opened (issue #1141)" '

test/sharness/t0060-daemon.sh

@@ -80,6 +80,16 @@ test_expect_success "ipfs help output looks good" '
   test_fsh cat help.txt
 '
 
+test_expect_success "ipfs help --help succeeds" '
+  ipfs help --help >help.txt
+'
+
+test_expect_success "ipfs help --help output looks good" '
+  egrep -i "^Usage" help.txt >/dev/null &&
+  egrep "ipfs .* <command>" help.txt >/dev/null ||
+  test_fsh cat help.txt
+'
+
 # netcat (nc) is needed for the following test
 test_expect_success "nc is available" '
   type nc >/dev/null

test/sharness/t0100-name.sh

@@ -158,6 +158,10 @@ test_expect_success "'ipfs name publish --help' succeeds" '
   ipfs name publish --help
 '
 
+test_expect_success "'ipfs help name publish' succeeds" '
+  ipfs help name publish
+'
+
 test_launch_ipfs_daemon
 
 test_expect_success "empty request to name publish doesn't panic and returns error" '