compare-trees: drop getopt to allow long opts and fix exits

Signed-off-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/dev/compare-trees b/dev/compare-trees
index aeaa086a86d1fb92b92bdb902cb34166e42abc44..584a5c7e0bc9388e859aede135ddfbfe866543d0 100755 (executable)
--- a/dev/compare-trees
+++ b/dev/compare-trees
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -u
+set -euo pipefail
 
 # Test that src and dest trees are as identical as bup is capable of
 # making them.  For now, use rsync -niaHAX ...
@@ -20,22 +20,20 @@ EOF
 
 verify_content=" --checksum"
 
-while getopts "hcx" OPTION
-do
-    case "$OPTION" in
-        h) usage; exit 0;;
-        c) verify_content=" --checksum";;
-        x) verify_content="";;
-        ?) usage 1>&2; exit 1;;
+while test $# -gt 0; do
+    case "$1" in
+        -h) usage; exit 0;;
+        -c) verify_content=" --checksum"; shift;;
+        -x) verify_content=""; shift;;
+        -*) usage 1>&2; exit 2;;
+        [^-]*) break;;
     esac
 done
 
-shift $(($OPTIND - 1)) || exit $?
-
 if ! test $# -eq 2
 then
     usage 1>&2
-    exit 1
+    exit 2
 fi
 
 src="$1"