From 5805576dcea2c685ef0f23a99ae29e250ee38bd8 Mon Sep 17 00:00:00 2001
From: Marc Jay <marc.jay@taskize.com>
Date: Wed, 22 Apr 2020 10:35:33 +0100
Subject: [PATCH] Check if gbase64 (GNU) is available on Mac and use it in
 preference to BSD base64

Previously it was switching to GNU versions of base64 even if base64 was the BSD version

Fixes #568
---
 include/os_detector | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/include/os_detector b/include/os_detector
index aa071564..2d2faf76 100644
--- a/include/os_detector
+++ b/include/os_detector
@@ -12,6 +12,7 @@
 # specific language governing permissions and limitations under the License.
 
 DATE_CMD="date"
+BASE64_CMD="base64"
 
 gnu_how_older_from_today() {
   DATE_TO_COMPARE=$1
@@ -44,10 +45,10 @@ bsd_timestamp_to_date() {
 }
 
 gnu_decode_report() {
-  base64 -d
+  "$BASE64_CMD" -d
 }
 bsd_decode_report() {
-  base64 -D
+  "$BASE64_CMD" -D
 }
 
 gnu_how_many_days_from_today() {
@@ -146,12 +147,16 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then
   # It is possible that the user has installed GNU coreutils on OS X. By default, this will make GNU commands
   # available with a 'g' prefix, e.g. 'gdate'. Test if this is present, and use it if so, as it supports more features.
   # The user also may have replaced the default Mac OS X BSD tools with the GNU coreutils equivalents.
-  # Only GNU date allows --version as a valid argument, so use the validity of this argument
+  # Only GNU date/base64 allows --version as a valid argument, so use the validity of this argument
   # as a means to detect that coreutils is installed and is overriding the default tools
   GDATE=$(which gdate)
   if [ -n "${GDATE}" ]; then
     DATE_CMD="gdate"
   fi
+  GBASE64=$(which gbase64)
+  if [ -n "${GBASE64}" ]; then
+    BASE64_CMD="gbase64"
+  fi
   if "$DATE_CMD" --version >/dev/null 2>&1 ; then
     how_older_from_today() {
       gnu_how_older_from_today "$1"
@@ -159,9 +164,6 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then
     timestamp_to_date() {
       gnu_timestamp_to_date "$1"
     }
-    decode_report() {
-      gnu_decode_report
-    }
     how_many_days_from_today() {
       gnu_how_many_days_from_today "$1"
     }
@@ -181,9 +183,6 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then
     timestamp_to_date() {
       bsd_timestamp_to_date "$1"
     }
-    decode_report() {
-      bsd_decode_report
-    }
     how_many_days_from_today() {
       bsd_how_many_days_from_today "$1"
     }
@@ -197,6 +196,15 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then
       bsd_get_iso8601_timestamp
     }
   fi
+  if "$BASE64_CMD" --version >/dev/null 2>&1 ; then
+    decode_report() {
+      gnu_decode_report
+    }
+  else
+    decode_report() {
+      bsd_decode_report
+    }
+  fi
   test_tcp_connectivity() {
     bsd_test_tcp_connectivity "$1" "$2" "$3"
   }