Code cleanup

dev/debug_osync.sh

@@ -7,7 +7,7 @@ PROGRAM_VERSION=1.1-RC2
 PROGRAM_BUILD=2016071801
 IS_STABLE=yes
 
-## FUNC_BUILD=2016071901
+## FUNC_BUILD=2016071902
 ## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
 
 ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode
@@ -743,6 +743,8 @@ function WaitForTaskCompletion {
 	local seconds_begin=$SECONDS # Seconds since the beginning of the script
 	local exec_time=0 # Seconds since the beginning of this function
 
+	local retval=0 # return value of monitored pid process
+
 	while eval "$PROCESS_TEST_CMD" > /dev/null
 	do
 		Spinner
@@ -774,7 +776,7 @@ function WaitForTaskCompletion {
 		sleep $SLEEP_TIME
 	done
 	wait $pid
-	local retval=$?
+	retval=$?
 	Logger "${FUNCNAME[0]} ended for [$caller_name] with status $retval." "PARANOIA_DEBUG"	#__WITH_PARANOIA_DEBUG
 	return $retval
 }
@@ -793,6 +795,8 @@ function WaitForCompletion {
 	local seconds_begin=$SECONDS # Seconds since the beginning of the script
 	local exec_time=0 # Seconds since the beginning of this function
 
+	local retval=0 # return value of monitored pid process
+
 	while eval "$PROCESS_TEST_CMD" > /dev/null
 	do
 		Spinner

dev/ofunctions.sh

@@ -1,4 +1,4 @@
-## FUNC_BUILD=2016071901
+## FUNC_BUILD=2016071902
 ## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
 
 ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode
@@ -734,6 +734,8 @@ function WaitForTaskCompletion {
 	local seconds_begin=$SECONDS # Seconds since the beginning of the script
 	local exec_time=0 # Seconds since the beginning of this function
 
+	local retval=0 # return value of monitored pid process
+
 	while eval "$PROCESS_TEST_CMD" > /dev/null
 	do
 		Spinner
@@ -765,7 +767,7 @@ function WaitForTaskCompletion {
 		sleep $SLEEP_TIME
 	done
 	wait $pid
-	local retval=$?
+	retval=$?
 	Logger "${FUNCNAME[0]} ended for [$caller_name] with status $retval." "PARANOIA_DEBUG"	#__WITH_PARANOIA_DEBUG
 	return $retval
 }
@@ -784,6 +786,8 @@ function WaitForCompletion {
 	local seconds_begin=$SECONDS # Seconds since the beginning of the script
 	local exec_time=0 # Seconds since the beginning of this function
 
+	local retval=0 # return value of monitored pid process
+
 	while eval "$PROCESS_TEST_CMD" > /dev/null
 	do
 		Spinner

osync.sh

@@ -7,7 +7,7 @@ PROGRAM_VERSION=1.1-RC2
 PROGRAM_BUILD=2016071801
 IS_STABLE=yes
 
-## FUNC_BUILD=2016071901
+## FUNC_BUILD=2016071902
 ## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
 
 ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode
@@ -724,6 +724,8 @@ function WaitForTaskCompletion {
 	local seconds_begin=$SECONDS # Seconds since the beginning of the script
 	local exec_time=0 # Seconds since the beginning of this function
 
+	local retval=0 # return value of monitored pid process
+
 	while eval "$PROCESS_TEST_CMD" > /dev/null
 	do
 		Spinner
@@ -755,7 +757,7 @@ function WaitForTaskCompletion {
 		sleep $SLEEP_TIME
 	done
 	wait $pid
-	local retval=$?
+	retval=$?
 	return $retval
 }
 
@@ -771,6 +773,8 @@ function WaitForCompletion {
 	local seconds_begin=$SECONDS # Seconds since the beginning of the script
 	local exec_time=0 # Seconds since the beginning of this function
 
+	local retval=0 # return value of monitored pid process
+
 	while eval "$PROCESS_TEST_CMD" > /dev/null
 	do
 		Spinner