From 8c440f34aa50ed34d7a71441ce44919332209214 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Thu, 30 Jul 2020 15:57:32 +0200
Subject: [PATCH] fixes some posix compatibility issues

---
 retry | 187 ++++++++++++++++++++++++++++------------------------------
 1 file changed, 91 insertions(+), 96 deletions(-)

diff --git a/retry b/retry
index 86d17a9..d56e89c 100755
--- a/retry
+++ b/retry
@@ -1,5 +1,4 @@
-#!/bin/sh
-
+#!/usr/bin/env sh
 GETOPT_BIN=$IN_GETOPT_BIN
 GETOPT_BIN=${GETOPT_BIN:-getopt}
 
@@ -9,7 +8,7 @@ __sleep_amount() {
   else
     #TODO: check for awk
     #TODO: check if user would rather use one of the other possible dependencies: python, ruby, bc, dc
-    sleep_time=`awk "BEGIN {t = $min_sleep * $(( (1<<($attempts -1)) )); print (t > $max_sleep ? $max_sleep : t)}"`
+    sleep_time=$(awk "BEGIN {t = $min_sleep * $(( (1<<(attempts -1)) )); print (t > $max_sleep ? $max_sleep : t)}")
   fi
 }
 
@@ -37,32 +36,32 @@ retry()
   local return_code=1
 
 
-  while [[ $return_code -ne 0 && $attempts -le $max_tries ]]; do
+  while [ "$return_code" -ne 0 ] && [ "$attempts" -le "$max_tries" ]; do
     if [ $attempts -gt 0 ]; then
       __sleep_amount
       __log_out "Before retry #$attempts: sleeping $sleep_time seconds"
-      sleep $sleep_time
+      sleep "$sleep_time"
     fi
 
     P="$1"
-    for param in "${@:2}"; do P="$P '$param'"; done
+    #for param in "${@:2}"; do P="$P '$param'"; done
     #TODO: replace single quotes in each arg with '"'"' ?
     export RETRY_ATTEMPT=$attempts
-    bash -c "$P"
+    sh -c "$P"
     return_code=$?
     #__log_out "Process returned $return_code on attempt $attempts"
     if [ $return_code -eq 127 ]; then
       # command not found
       exit $return_code
     elif [ $return_code -ne 0 ]; then
-      attempts=$[$attempts +1]
+      attempts=$((attempts +1))
     fi
   done
 
-  if [ $attempts -gt $max_tries ]; then
+  if [ "$attempts" -gt "$max_tries" ]; then
     if [ -n "$fail_script" ]; then
       __log_out "Retries exhausted, running fail script"
-      eval $fail_script
+      eval "$fail_script"
     else
       __log_out "Retries exhausted"
     fi
@@ -71,93 +70,89 @@ retry()
   exit $return_code
 }
 
-# If we're being sourced, don't worry about such things
-if [ "$BASH_SOURCE" == "$0" ]; then
-  # Prints the help text
-  help()
-  {
-    local retry=$(basename $0)
-    cat <<EOF
+
+help()
+{
+local retry=$(basename "$0")
+cat <<EOF
 Usage: $retry [options] -- execute command
-    -h, -?, --help
-    -v, --verbose                    Verbose output
-    -t, --tries=#                    Set max retries: Default 10
-    -s, --sleep=secs                 Constant sleep amount (seconds)
-    -m, --min=secs                   Exponential Backoff: minimum sleep amount (seconds): Default 0.3
-    -x, --max=secs                   Exponential Backoff: maximum sleep amount (seconds): Default 60
-    -f, --fail="script +cmds"        Fail Script: run in case of final failure
+-h, -?, --help
+-v, --verbose                    Verbose output
+-t, --tries=#                    Set max retries: Default 10
+-s, --sleep=secs                 Constant sleep amount (seconds)
+-m, --min=secs                   Exponential Backoff: minimum sleep amount (seconds): Default 0.3
+-x, --max=secs                   Exponential Backoff: maximum sleep amount (seconds): Default 60
+-f, --fail="script +cmds"        Fail Script: run in case of final failure
 EOF
-  }
-
-  # show help for no arguments if stdin is a terminal
-  if { [ -z "$1" ] && [ -t 0 ] ; } || [ "$1" == '-h' ] || [ "$1" == '-?' ] || [ "$1" == '--help' ]
-  then
-    help
-    exit 0
-  fi
-
-  $GETOPT_BIN --test > /dev/null
-  if [[ $? -ne 4 ]]; then
-      echo "I’m sorry, 'getopt --test' failed in this environment. Please load GNU getopt."
-      exit 1
-  fi
-
-  OPTIONS=vt:s:m:x:f:
-  LONGOPTIONS=verbose,tries:,sleep:,min:,max:,fail:
-
-  PARSED=$($GETOPT_BIN --options="$OPTIONS" --longoptions="$LONGOPTIONS" --name "$0" -- "$@")
-  if [[ $? -ne 0 ]]; then
-    # e.g. $? == 1
-    #  then getopt has complained about wrong arguments to stdout
-    exit 2
-  fi
-  # read getopt’s output this way to handle the quoting right:
-  eval set -- "$PARSED"
-
-  max_tries=10
-  min_sleep=0.3
-  max_sleep=60.0
-  constant_sleep=
-  fail_script=
-
-  # now enjoy the options in order and nicely split until we see --
-  while true; do
-      case "$1" in
-          -v|--verbose)
-              VERBOSE=true
-              shift
-              ;;
-          -t|--tries)
-              max_tries="$2"
-              shift 2
-              ;;
-          -s|--sleep)
-              constant_sleep="$2"
-              shift 2
-              ;;
-          -m|--min)
-              min_sleep="$2"
-              shift 2
-              ;;
-          -x|--max)
-              max_sleep="$2"
-              shift 2
-              ;;
-          -f|--fail)
-              fail_script="$2"
-              shift 2
-              ;;
-          --)
-              shift
-              break
-              ;;
-          *)
-              echo "Programming error"
-              exit 3
-              ;;
-      esac
-  done
-
-  retry "$max_tries" "$min_sleep" "$max_sleep" "$constant_sleep" "$fail_script" "$@"
+}
 
+# show help for no arguments if stdin is a terminal
+if { [ -z "$1" ] && [ -t 0 ] ; } || [ "$1" = '-h' ] || [ "$1" = '-?' ] || [ "$1" = '--help' ]
+then
+help
+exit 0
 fi
+
+$GETOPT_BIN --test > /dev/null
+if [ $? -ne 4 ]; then
+    echo "I’m sorry, 'getopt --test' failed in this environment. Please load GNU getopt."
+    exit 1
+fi
+
+OPTIONS=vt:s:m:x:f:
+LONGOPTIONS=verbose,tries:,sleep:,min:,max:,fail:
+
+PARSED=$($GETOPT_BIN --options="$OPTIONS" --longoptions="$LONGOPTIONS" --name "$0" -- "$@")
+if [ $? -ne 0 ]; then
+# e.g. $? == 1
+#  then getopt has complained about wrong arguments to stdout
+exit 2
+fi
+# read getopt’s output this way to handle the quoting right:
+eval set -- "$PARSED"
+
+max_tries=10
+min_sleep=0.3
+max_sleep=60.0
+constant_sleep=
+fail_script=
+
+# now enjoy the options in order and nicely split until we see --
+while true; do
+    case "$1" in
+        -v|--verbose)
+            VERBOSE=true
+            shift
+            ;;
+        -t|--tries)
+            max_tries="$2"
+            shift 2
+            ;;
+        -s|--sleep)
+            constant_sleep="$2"
+            shift 2
+            ;;
+        -m|--min)
+            min_sleep="$2"
+            shift 2
+            ;;
+        -x|--max)
+            max_sleep="$2"
+            shift 2
+            ;;
+        -f|--fail)
+            fail_script="$2"
+            shift 2
+            ;;
+        --)
+            shift
+            break
+            ;;
+        *)
+            echo "Programming error"
+            exit 3
+            ;;
+    esac
+done
+
+retry "$max_tries" "$min_sleep" "$max_sleep" "$constant_sleep" "$fail_script" "$@"