Linux/obackup
1
0
Fork 0
mirror of https://github.com/deajan/obackup.git synced 2026-02-10 17:10:55 +01:00
Code Issues Releases Wiki Activity

Added file / sql backup rotation distinction

Browse Source
This commit is contained in:
deajan
2015-11-16 12:52:15 +01:00
parent 541119dda2
commit 013fbdf000
6 changed files with 76 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dev/ofunctions.sh
View File

@@ -1,4 +1,4 @@
FUNC_BUILD=2015111102
FUNC_BUILD=2015111601
## BEGIN Generic functions for osync & obackup written in 2013-2015 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
@@ -541,8 +541,9 @@ function RunLocalCommand {
if [ $_DRYRUN -ne 0 ]; then
Logger "Dryrun: Local command [$command] not run." "NOTICE"
return 1
return 0
fi
Logger "Running command [$command] on local host." "NOTICE"
eval "$command" > "$RUN_DIR/$PROGRAM.$FUNCNAME.$SCRIPT_PID" 2>&1 &
WaitForTaskCompletion $! 0 $hard_max_time $FUNCNAME
@@ -573,8 +574,9 @@ function RunRemoteCommand {
CheckConnectivityRemoteHost
if [ $_DRYRUN -ne 0 ]; then
Logger "Dryrun: Local command [$command] not run." "NOTICE"
return 1
return 0
fi
Logger "Running command [$command] on remote host." "NOTICE"
cmd=$SSH_CMD' "$command" > "'$RUN_DIR/$PROGRAM.$FUNCNAME.$SCRIPT_PID'" 2>&1'
Logger "cmd: $cmd" "DEBUG"