diff --git a/dev/debug_obackup.sh b/dev/debug_obackup.sh index a8e59cd..7d8b4fd 100755 --- a/dev/debug_obackup.sh +++ b/dev/debug_obackup.sh @@ -8,7 +8,7 @@ PROGRAM_VERSION=2.0-pre PROGRAM_BUILD=2016033101 IS_STABLE=no -## FUNC_BUILD=2016033104 +## FUNC_BUILD=2016033105 ## 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 @@ -169,6 +169,7 @@ function KillChilds { return 1 else return 0 + fi fi fi # sleep 15 needs to wait before killing itself @@ -551,8 +552,8 @@ function WaitForTaskCompletion { return 1 fi #kill -s SIGTERM $pid - if [ $? == 0 ]; then - Logger "Task stopped succesfully" "NOTICE" + #if [ $? == 0 ]; then + # Logger "Task stopped succesfully" "NOTICE" #else # Logger "Sending SIGTERM to proces failed. Trying the hard way." "ERROR" # sleep 5 && kill -9 $pid diff --git a/dev/ofunctions.sh b/dev/ofunctions.sh index 9c8f9c6..ab8f181 100644 --- a/dev/ofunctions.sh +++ b/dev/ofunctions.sh @@ -1,4 +1,4 @@ -## FUNC_BUILD=2016033104 +## FUNC_BUILD=2016033105 ## 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 @@ -159,6 +159,7 @@ function KillChilds { return 1 else return 0 + fi fi fi # sleep 15 needs to wait before killing itself @@ -541,8 +542,8 @@ function WaitForTaskCompletion { return 1 fi #kill -s SIGTERM $pid - if [ $? == 0 ]; then - Logger "Task stopped succesfully" "NOTICE" + #if [ $? == 0 ]; then + # Logger "Task stopped succesfully" "NOTICE" #else # Logger "Sending SIGTERM to proces failed. Trying the hard way." "ERROR" # sleep 5 && kill -9 $pid diff --git a/obackup.sh b/obackup.sh index 4f58523..487c219 100755 --- a/obackup.sh +++ b/obackup.sh @@ -8,7 +8,7 @@ PROGRAM_VERSION=2.0-pre PROGRAM_BUILD=2016033101 IS_STABLE=no -## FUNC_BUILD=2016033104 +## FUNC_BUILD=2016033105 ## 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 @@ -159,6 +159,7 @@ function KillChilds { return 1 else return 0 + fi fi fi # sleep 15 needs to wait before killing itself @@ -534,8 +535,8 @@ function WaitForTaskCompletion { return 1 fi #kill -s SIGTERM $pid - if [ $? == 0 ]; then - Logger "Task stopped succesfully" "NOTICE" + #if [ $? == 0 ]; then + # Logger "Task stopped succesfully" "NOTICE" #else # Logger "Sending SIGTERM to proces failed. Trying the hard way." "ERROR" # sleep 5 && kill -9 $pid