Linux/obackup
1
0
Fork 0
mirror of https://github.com/deajan/obackup.git synced 2025-01-12 15:13:53 +01:00
Code Issues Releases Wiki Activity

Fixing wrong ofunctions.sh upload

Browse Source
This commit is contained in:
deajan 2016-03-31 23:00:01 +02:00
parent d39f6d092d
commit 087638c8ae
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dev/debug_obackup.sh
View File

@ -8,7 +8,7 @@ PROGRAM_VERSION=2.0-pre
PROGRAM_BUILD=2016033101 PROGRAM_BUILD=2016033101
IS_STABLE=no 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 ## 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 ## 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 return 1
else else
return 0 return 0
fi
fi fi
fi fi
# sleep 15 needs to wait before killing itself # sleep 15 needs to wait before killing itself
@ -551,8 +552,8 @@ function WaitForTaskCompletion {
return 1 return 1
fi fi
#kill -s SIGTERM $pid #kill -s SIGTERM $pid
if [ $? == 0 ]; then #if [ $? == 0 ]; then
Logger "Task stopped succesfully" "NOTICE" # Logger "Task stopped succesfully" "NOTICE"
#else #else
# Logger "Sending SIGTERM to proces failed. Trying the hard way." "ERROR" # Logger "Sending SIGTERM to proces failed. Trying the hard way." "ERROR"
# sleep 5 && kill -9 $pid # sleep 5 && kill -9 $pid

7
dev/ofunctions.sh
View File

@ -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 ## 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 ## 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 return 1
else else
return 0 return 0
fi
fi fi
fi fi
# sleep 15 needs to wait before killing itself # sleep 15 needs to wait before killing itself
@ -541,8 +542,8 @@ function WaitForTaskCompletion {
return 1 return 1
fi fi
#kill -s SIGTERM $pid #kill -s SIGTERM $pid
if [ $? == 0 ]; then #if [ $? == 0 ]; then
Logger "Task stopped succesfully" "NOTICE" # Logger "Task stopped succesfully" "NOTICE"
#else #else
# Logger "Sending SIGTERM to proces failed. Trying the hard way." "ERROR" # Logger "Sending SIGTERM to proces failed. Trying the hard way." "ERROR"
# sleep 5 && kill -9 $pid # sleep 5 && kill -9 $pid

7
obackup.sh
View File

@ -8,7 +8,7 @@ PROGRAM_VERSION=2.0-pre
PROGRAM_BUILD=2016033101 PROGRAM_BUILD=2016033101
IS_STABLE=no 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 ## 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 ## 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 return 1
else else
return 0 return 0
fi
fi fi
fi fi
# sleep 15 needs to wait before killing itself # sleep 15 needs to wait before killing itself
@ -534,8 +535,8 @@ function WaitForTaskCompletion {
return 1 return 1
fi fi
#kill -s SIGTERM $pid #kill -s SIGTERM $pid
if [ $? == 0 ]; then #if [ $? == 0 ]; then
Logger "Task stopped succesfully" "NOTICE" # Logger "Task stopped succesfully" "NOTICE"
#else #else
# Logger "Sending SIGTERM to proces failed. Trying the hard way." "ERROR" # Logger "Sending SIGTERM to proces failed. Trying the hard way." "ERROR"
# sleep 5 && kill -9 $pid # sleep 5 && kill -9 $pid