Fixed #47. A call for help should return a non-zero exit code.

3 files changed, 13 insertions, 15 deletions

diff --git a/shflags b/shflags
index a261802..1ed2d00 100644
--- a/shflags
+++ b/shflags
@@ -892,7 +892,7 @@ _flags_parseGetopt() {
       if [ "${FLAGS_help}" -eq ${FLAGS_TRUE} ]; then
         flags_help
         flags_error='help requested'
-        flags_return=${FLAGS_TRUE}
+        flags_return=${FLAGS_FALSE}
         break
       fi
     fi
diff --git a/shflags_issue_28_test.sh b/shflags_issue_28_test.sh
index 02c3803..fbb17d9 100755
--- a/shflags_issue_28_test.sh
+++ b/shflags_issue_28_test.sh
@@ -37,8 +37,8 @@ _testHelp() {
     FLAGS "${flag}" >"${stdoutF}" 2>"${stderrF}"
     echo $? >"${returnF}"
   )
-  assertTrue \
-      'short help request should have returned a true exit code.' \
+  assertFalse \
+      'short help request should have returned a false exit code.' \
       "$(th_queryReturn)"
   grep 'show this help' "${stderrF}" >/dev/null
   grepped=$?
@@ -93,9 +93,6 @@ EOF
     FLAGS_HELP=${help};
     FLAGS -h >"${stdoutF}" 2>"${stderrF}"
   )
-  r3turn=$?
-  assertTrue "FLAGS -h return: want ${FLAGS_TRUE}, got ${r3turn}" ${r3turn}
-
   diff "${expectedF}" "${stderrF}" >/dev/null
   r3turn=$?
   assertTrue 'unexpected help output' ${r3turn}
@@ -120,9 +117,6 @@ EOF
     FLAGS_HELP=${help};
     FLAGS -h >"${stdoutF}" 2>"${stderrF}"
   )
-  r3turn=$?
-  assertTrue 'a call for help should not return an error' ${r3turn}
-
   diff "${expectedF}" "${stderrF}" >/dev/null
   differed=$?
   assertTrue 'unexpected help output' ${differed}
diff --git a/shflags_public_test.sh b/shflags_public_test.sh
index e615ffc..41eacba 100755
--- a/shflags_public_test.sh
+++ b/shflags_public_test.sh
@@ -37,8 +37,8 @@ _testHelp() {
     FLAGS "${flag}" >"${stdoutF}" 2>"${stderrF}"
     echo $? >"${returnF}"
   )
-  assertTrue \
-      'short help request should have returned a true exit code.' \
+  assertFalse \
+      'a call for help should return a non-zero exit code.' \
       "$(th_queryReturn)"
   grep 'show this help' "${stderrF}" >/dev/null
   grepped=$?
@@ -102,9 +102,11 @@ EOF
     _flags_columns() { mock_flags_columns; }
     FLAGS_HELP=${help};
     FLAGS -h >"${stdoutF}" 2>"${stderrF}"
+    echo $? >"${returnF}"
   )
-  r3turn=$?
-  assertTrue 'a call for help should not return an error' ${r3turn}
+  assertFalse \
+      'a call for help should return a non-zero exit code.' \
+      "$(th_queryReturn)"
 
   diff "${expectedF}" "${stderrF}" >/dev/null
   r3turn=$?
@@ -142,9 +144,11 @@ EOF
     # shellcheck disable=SC2034
     FLAGS_HELP=${help};
     FLAGS -h >"${stdoutF}" 2>"${stderrF}"
+    echo $? >"${returnF}"
   )
-  r3turn=$?
-  assertTrue 'a call for help should not return an error' ${r3turn}
+  assertFalse \
+      'a call for help should return a non-zero exit code.' \
+      "$(th_queryReturn)"
 
   diff "${expectedF}" "${stderrF}" >/dev/null
   differed=$?