faxsetup: Add another base64 encoder

This simplifies the logic for setting BASE64ENCODE, while adding support
for "base64" found at least on FreeBSD.

Seen in:
| commit f9871f9ac111aa47d76d6e60d37ce6b09821a4c3
| Author: Lee Howard <faxguy@howardsilvan.com>
| Date:   Tue Mar 13 17:04:49 2007 +0000
|
|   Adds support for John Walker's base64 encoder found at least on
|   FreeBSD.
|
|   http://www.fourmilab.ch/webtools/base64/

diff --git a/etc/faxsetup.sh.in b/etc/faxsetup.sh.in
index 99d57ad3df19d2e43370da877451f318f32eaddb..f443d7ad4717673190cea35ba7e29ac39445f2b0 100644 (file)
--- a/etc/faxsetup.sh.in
+++ b/etc/faxsetup.sh.in
@@ -796,18 +796,15 @@ test -x "$UUENCODE" || {
 
 # $BASE64ENCODE may contain parameters
 cmd=`echo "$BASE64ENCODE" | $SED -e "s/^ *//" -e "s/ .*$//"`
-test -x "$cmd" || {
-    BASE64ENCODE=`findAppDef mimencode $PATH mimencode`
-    test -x $BASE64ENCODE || {
-       BASE64ENCODE=`findAppDef base64-encode $PATH base64-encode`
-       test -x $BASE64ENCODE || {
-           if [ -x "$UUENCODE" ]; then
-               if capture "$UUENCODE -m $PASSWD foo"; then
-                       BASE64ENCODE="$UUENCODE -m ==== | $GREP -v ===="
-               fi
-           fi
-       }
-    }
+test -x "$cmd" || BASE64ENCODE=`findAppDef mimencode $PATH mimencode`
+test -x $BASE64ENCODE || BASE64ENCODE=`findAppDef base64-encode $PATH base64-encode`
+test -x $BASE64ENCODE || BASE64ENCODE=`findAppDef base64 $PATH base64`
+test -x $BASE64ENCODE || {
+    if [ -x "$UUENCODE" ]; then
+        if capture "$UUENCODE -m $PASSWD foo"; then
+                BASE64ENCODE="$UUENCODE -m ==== | $GREP -v ===="
+        fi
+    fi
 }
 test -n "$BASE64ENCODE" && Note "Found base64 encoder: $BASE64ENCODE"