Merge pull request #314 from github/xn4p4lm-feature-checker-bug-fix

Bug fix with feature checker

Author: djdefi

share/github-backup-utils/ghe-rsync-feature-checker

@@ -7,11 +7,41 @@
 set -o pipefail
 
 # set the variable from the first argument and remove any leading dashes
-rsync_command=$(echo "$1" | sed -E 's/^-+//')
+rsync_command=$1
 
-# check if the passed rsync command is supported by the current version of rsync
-if rsync -h | grep -E "\B-+($rsync_command)\b" >/dev/null 2>&1; then
-  echo "true"
+# extract dashes if present into variable
+leading_dashes=$(echo "$rsync_command" | grep -oE "^-+")
+
+# this normalizes the passed command by removing any leading dashes
+normalized_command=$(echo "$rsync_command" | sed -E "s/^-+//")
+
+# this checks the rsync command and returns the found command if it is valid
+found_command=$(rsync -h | grep -oE "\B-+($normalized_command)\b" | head -n "1")
+
+# this is the normalized found command
+normalized_found_command=$(echo "$found_command" | sed -E "s/^-+//")
+
+## Check if $leading_dashes is either - or --
+if [ "$leading_dashes" == "-" ]; then
+  # check if the passed rsync command is valid and supported or if the normalized command is valid and supported
+  if [ "$rsync_command" == "$found_command" ]; then
+    echo "true"
+  else
+    echo "false"
+  fi
+elif [ "$leading_dashes" == "--" ]; then
+    # check if the passed rsync command is valid and supported or if the normalized command is valid and supported
+  if [ "$rsync_command" == "$found_command" ]; then
+    echo "true"
+  else
+    echo "false"
+  fi
 else
-  echo "false"
-fi
+  # check if the passed rsync command is valid and supported or if the normalized command is valid and supported
+  if [ "$rsync_command" == "$normalized_found_command" ]; then
+    echo "true"
+  else
+    echo "false"
+  fi
+fi
+

test/test-ghe-rsync-feature-checker.sh

@@ -8,7 +8,7 @@ TESTS_DIR="$PWD/$(dirname "$0")"
 
 ## testing for known supported command help with and without leading dashes
 
-begin_test "Testing ghe-rsync-feature-checker for known supported command --help"
+begin_test "Testing ghe-rsync-feature-checker with known supported command --help"
 (
     set -e
 
@@ -17,6 +17,15 @@ begin_test "Testing ghe-rsync-feature-checker for known supported command --help
 )
 end_test
 
+begin_test "Testing ghe-rsync-feature-checker with known unsupported command -help"
+(
+    set -e
+
+    # Test ghe-rsync-feature-checker command
+    ghe-rsync-feature-checker -help | grep -q "false"
+)
+end_test
+
 begin_test "Testing ghe-rsync-feature-checker with known supported command help"
 (
     set -e
@@ -38,6 +47,16 @@ begin_test "Testing ghe-rsync-feature-checker with known unsupported command --n
 )
 end_test
 
+begin_test "Testing ghe-rsync-feature-checker with known unsupported command -not-an-actual-feature"
+(
+    set -e
+
+    # Test ghe-rsync-feature-checker command 
+    ghe-rsync-feature-checker -not-an-actual-feature | grep -q "false"
+    
+)
+end_test
+
 begin_test "Testing ghe-rsync-feature-checker with known unsupported command not-an-actual-feature"
 (
     set -e
@@ -98,6 +117,15 @@ begin_test "Testing ghe-rsync-feature-checker with known supported command --ver
 )
 end_test
 
+begin_test "Testing ghe-rsync-feature-checker with known unsupported command -verbose"
+(
+    set -e
+
+    # Test ghe-rsync-feature-checker command
+    ghe-rsync-feature-checker -verbose | grep -q "false"
+)
+end_test
+
 begin_test "Testing ghe-rsync-feature-checker with known supported command verbose"
 (
     set -e