|
|
|
@ -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
|
|
|
|
|