From f4525f0f135bb3659ebc81a3cd3f58edf76efded Mon Sep 17 00:00:00 2001
From: deajan <ozy@netpower.fr>
Date: Mon, 1 Oct 2018 15:12:16 +0200
Subject: [PATCH] Quicker PoorMansRandomGenerator function + shellcheck fixes

---
 dev/ofunctions.sh | 51 ++++++++++++++---------------------------------
 1 file changed, 15 insertions(+), 36 deletions(-)

diff --git a/dev/ofunctions.sh b/dev/ofunctions.sh
index 9eeb503..e45b05a 100644
--- a/dev/ofunctions.sh
+++ b/dev/ofunctions.sh
@@ -8,7 +8,7 @@
 #### OFUNCTIONS FULL SUBSET ####
 #### OFUNCTIONS MINI SUBSET ####
 _OFUNCTIONS_VERSION=2.3.0-RC1
-_OFUNCTIONS_BUILD=2018093003
+_OFUNCTIONS_BUILD=2018100105
 #### _OFUNCTIONS_BOOTSTRAP SUBSET ####
 _OFUNCTIONS_BOOTSTRAP=true
 #### _OFUNCTIONS_BOOTSTRAP SUBSET END ####
@@ -105,38 +105,17 @@ fi
 #### PoorMansRandomGenerator SUBSET ####
 # Get a random number on Windows BusyBox alike, also works on most Unixes
 function PoorMansRandomGenerator {
-	local digits="${1}"		# The number of digits to generate
+        local digits="${1}" # The number of digits to generate
+        local number
 
-	local minimum=1
-	local maximum
-	local n=0
-	
-	if [ "$digits" == "" ]; then
-		digits=5
-	fi
-	
-	# Minimum already has a digit
-	for n in $(seq 1 $((digits-1))); do
-		minimum=$minimum"0"
-		maximum=$maximum"9"
-	done
-	maximum=$maximum"9"
-	
-	#n=0; while [ $n -lt $minimum ]; do n=$n$(dd if=/dev/urandom bs=100 count=1 2>/dev/null | tr -cd '0-9'); done; n=$(echo $n | sed -e 's/^0//')
-	# bs=19 since if real random strikes, having a 19 digits number is not supported
-	while [ $n -lt $minimum ] || [ $n -gt $maximum ]; do
-		if [ $n -lt $minimum ]; then
-			# Add numbers
-			n=$n$(dd if=/dev/urandom bs=19 count=1 2>/dev/null | tr -cd '0-9')
-			n=$(echo $n | sed -e 's/^0//')
-			if [ "$n" == "" ]; then
-				n=0
-			fi
-		elif [ $n -gt $maximum ]; then
-			n=$(echo $n | sed 's/.$//')
-		fi
-	done
-	echo $n
+        # Some read bytes can't be used, se we read twice the number of required bytes
+        dd if=/dev/urandom bs=$digits count=2 2> /dev/null | while read -r -n1 char; do
+                number=$number$(printf "%d" "'$char")
+                if [ ${#number} -ge $digits ]; then
+                        echo ${number:0:$digits}
+                        break;
+                fi
+        done
 }
 #### PoorMansRandomGenerator SUBSET END ####
 
@@ -1885,9 +1864,9 @@ function RsyncPatternsAdd {
 			rest="${rest#*$PATH_SEPARATOR_CHAR}"
 		fi
 			if [ "$RSYNC_PATTERNS" == "" ]; then
-			RSYNC_PATTERNS="--"$patternType"=\"$str\""
+			RSYNC_PATTERNS="--$patternType=\"$str\""
 		else
-			RSYNC_PATTERNS="$RSYNC_PATTERNS --"$patternType"=\"$str\""
+			RSYNC_PATTERNS="$RSYNC_PATTERNS --$patternType=\"$str\""
 		fi
 	done
 	set +f
@@ -1904,7 +1883,7 @@ function RsyncPatternsFromAdd {
 	fi
 
 	if [ -e "$patternFrom" ]; then
-		RSYNC_PATTERNS="$RSYNC_PATTERNS --"$patternType"-from=\"$patternFrom\""
+		RSYNC_PATTERNS="$RSYNC_PATTERNS --$patternType-from=\"$patternFrom\""
 	fi
 }
 
@@ -2229,7 +2208,7 @@ function VerComp () {
 		return 1
 	fi
 
-	if [[ $1 == $2 ]]
+	if [[ "$1" == "$2" ]]
 		then
 			echo 0
 		return