Check that OpenSSL md5 supports -r before using it (#915)

* Check that OpenSSL md5 supports -r before using it

Fixes #914

* Remove unused variable assignment

Fixes #914

diff --git a/hcache/hcachever.sh b/hcache/hcachever.sh
index 3070dee178621f412f991c4f5e8acd11b0f2dabf..c5343a3016d5918e69588a4f8a82562aaa8e1eb1 100755 (executable)
--- a/hcache/hcachever.sh
+++ b/hcache/hcachever.sh
@@ -60,8 +60,12 @@ md5prog () {
   # Use OpenSSL if it's installed
   openssl=`which openssl`
   if [ $? = 0 ];then
-    echo "$openssl md5 -r"
-    return
+    # Check that openssl supports the -r option (requires version 1.1.0)
+    echo test | openssl md5 -r 2&> /dev/null
+    if [ $? = 0 ]; then
+      echo "$openssl md5 -r"
+      return
+    fi
   fi
 
   # Fallback to looking for a system-specific utility
@@ -70,8 +74,8 @@ md5prog () {
       # This matches most of the Solaris family
       prog="digest -a md5"
       ;;
-    *BSD)
-      # FreeBSD, NetBSD, and OpenBSD all have md5
+    *BSD|Darwin)
+      # Darwin, FreeBSD, NetBSD, and OpenBSD all have md5
       prog="md5"
       ;;
     *)
@@ -96,8 +100,8 @@ do
        STRUCT=`getstruct "$line"`
        if test -n "$STRUCT"
        then
-        NAME=`echo $STRUCT | cut -d: -f1`
-        BODY=`echo $STRUCT | cut -d' ' -f2-`
+         NAME=`echo $STRUCT | cut -d: -f1`
+         BODY=`echo $STRUCT | cut -d' ' -f2-`
          echo " * $NAME:" $BODY >> $TMPD
          TEXT="$TEXT $NAME {$BODY}"
        fi