changed base64 --decode to be portable

.bash.d/kubernetes.sh

@@ -305,11 +305,12 @@ k8s_get_ca_cert(){
 # curl --cert client_cert.pem --key client_key.pem --cacert ca_cert.pem https://k8smaster:6443/api/v1/pods
 # curl --cert client_cert.pem --key client_key.pem --cacert ca_cert.pem https://k8smaster:6443/api/v1/pods/namespaces/default/pods -XPOST -H 'Content-Type: application/json' -d @pod_defintion.json
 k8s_get_keys(){
-    k8s_get_client_cert | base64 -d - > client_cert.pem
+    # use --decode not -d / -D which varies between Linux and Mac
+    k8s_get_client_cert | base64 --decode - > client_cert.pem
     echo "generated client_cert.pem"
-    k8s_get_client_key | base64 -d - > client_key.pem
+    k8s_get_client_key | base64 --decode - > client_key.pem
     echo "generated client_key.pem"
-    k8s_get_ca_cert | base64 -d - > ca_cert.pem
+    k8s_get_ca_cert | base64 --decode - > ca_cert.pem
     echo "generated ca_cert.pem"
 }
 

.bash.d/prompt.sh

@@ -67,9 +67,9 @@ export PS1+="\[$PS1_COLOUR\]\t \[$PS1_USER_COLOUR\]\u\[$txtwht\]@\[$bldgrn\]\h:\
 #
 #   base64 <<< "$PS1"
 #
-# and then pass the result through base64 -d
+# and then pass the result through base64 --decode
 #
-#   base64 <<< "$PS1" | base64 -d
+#   base64 <<< "$PS1" | base64 --decode
 #
 # is a noop to demonstrate
 

aws_users_access_key_age_report.sh

@@ -47,12 +47,13 @@ srcdir="$(dirname "${BASH_SOURCE[0]}")"
 
 "$srcdir/aws_iam_generate_credentials_report_wait.sh" >&2
 
-if [ "$(uname -s)" = Darwin ]; then
-    base64_decode="base64 -D"
-else
-    base64_decode="base64 -d"
-fi
+# use --decode not -d / -D which varies between Linux and Mac
+#if [ "$(uname -s)" = Darwin ]; then
+#    base64_decode="base64 -D"
+#else
+#    base64_decode="base64 -d"
+#fi
 
 aws iam get-credential-report --query 'Content' --output text |
-$base64_decode |
+base64 --decode |
 cut -d, -f1,9,10,14,15

aws_users_access_key_last_used_report.sh

@@ -30,12 +30,13 @@ srcdir="$(dirname "${BASH_SOURCE[0]}")"
 
 "$srcdir/aws_iam_generate_credentials_report_wait.sh" >&2
 
-if [ "$(uname -s)" = Darwin ]; then
-    base64_decode="base64 -D"
-else
-    base64_decode="base64 -d"
-fi
+# use --decode not -d / -D which varies between Linux and Mac
+#if [ "$(uname -s)" = Darwin ]; then
+#    base64_decode="base64 -D"
+#else
+#    base64_decode="base64 -d"
+#fi
 
 aws iam get-credential-report --query 'Content' --output text |
-$base64_decode |
+base64 --decode |
 cut -d, -f1,9,11,14,16

aws_users_last_used_report.sh

@@ -36,13 +36,14 @@ srcdir="$(dirname "${BASH_SOURCE[0]}")"
 
 "$srcdir/aws_iam_generate_credentials_report_wait.sh" >&2
 
-if [ "$(uname -s)" = Darwin ]; then
-    base64_decode="base64 -D"
-else
-    base64_decode="base64 -d"
-fi
+# use --decode not -d / -D which varies between Linux and Mac
+#if [ "$(uname -s)" = Darwin ]; then
+#    base64_decode="base64 -D"
+#else
+#    base64_decode="base64 -d"
+#fi
 
 # not documented in 'aws iam get-credential-report help'
 aws iam get-credential-report --query 'Content' --output text |
-$base64_decode |
+base64 --decode |
 cut -d, -f1,5,11,16

aws_users_mfa_active_report.sh

@@ -36,13 +36,14 @@ srcdir="$(dirname "${BASH_SOURCE[0]}")"
 
 "$srcdir/aws_iam_generate_credentials_report_wait.sh" >&2
 
-if [ "$(uname -s)" = Darwin ]; then
-    base64_decode="base64 -D"
-else
-    base64_decode="base64 -d"
-fi
+# use --decode not -d / -D which varies between Linux and Mac
+#if [ "$(uname -s)" = Darwin ]; then
+#    base64_decode="base64 -D"
+#else
+#    base64_decode="base64 -d"
+#fi
 
 # not documented in 'aws iam get-credential-report help'
 aws iam get-credential-report --query 'Content' --output text |
-$base64_decode |
+base64 --decode |
 cut -d, -f1,4,8

kubernetes_get_secret_values.sh

@@ -45,16 +45,12 @@ help_usage "$@"
 
 min_args 1 "$@"
 
-base64_decode_switch="-d"
-if is_mac; then
-    base64_decode_switch="-D"
-fi
-
 #kubectl get secret stackdriver-api-key -o 'jsonpath={.data.stackdriver-api-key}' | base64 -D
 kubectl get secret "$@" -o json |
 # @base64d works nicely on jq 1.6 but not available on 1.5
 #jq -r '.data | to_entries[] | [.key, (.value | @base64d) ] | @tsv''
 jq -r '.data | to_entries[] | [.key, .value] | @tsv' |
 while read -r key value; do
-    printf '%s\t%s\n' "$key" "$(base64 "$base64_decode_switch" <<< "$value")"
+    # use --decode not -d / -D which varies between Linux and Mac
+    printf '%s\t%s\n' "$key" "$(base64 --decode <<< "$value")"
 done