Linux/obackup
1
0
Fork 0
mirror of https://github.com/deajan/obackup.git synced 2025-02-05 19:03:50 +01:00
Code Issues Releases Wiki Activity

Fixed some more typos. Should not code at night, really

Browse Source
This commit is contained in:
deajan 2015-01-08 20:05:58 +01:00
parent 03e0ec4654
commit 2c87aee183
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -22,8 +22,10 @@ UNDER WORK
CHANGELOG CHANGELOG
--------- ---------
- Fixed some typos with ported code from osync rendering stats and partial downloads unusable
- Added delete on destination option for files that vanished from source - Added delete on destination option for files that vanished from source
- Fixed ignoring compression level in conf file - Fixed ignoring compression level in conf file
- Added experimental partial downloads support for rsync so big files can be resumed on slow links
- Fixed dry mode sql backup output - Fixed dry mode sql backup output
- Prevented triggering TrapError if there are no child processes to terminate on TrapQuit - Prevented triggering TrapError if there are no child processes to terminate on TrapQuit
- Improved mysql debug logs - Improved mysql debug logs

22
obackup.sh
View File

@ -3,9 +3,9 @@
###### Remote (or local) backup script for files & databases ###### Remote (or local) backup script for files & databases
###### (L) 2013-2015 by Orsiris "Ozy" de Jong (www.netpower.fr) ###### (L) 2013-2015 by Orsiris "Ozy" de Jong (www.netpower.fr)
AUTHOR="(L) 2013-2015 by Orsiris \"Ozy\" de Jong" AUTHOR="(L) 2013-2015 by Orsiris \"Ozy\" de Jong"
CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr"
PROGRAM_VERSION=1.84RC4 PROGRAM_VERSION=1.84RC4
PROGRAM_BUILD=0801201502 PROGRAM_BUILD=0801201504
## type doesn't work on platforms other than linux (bash). If if doesn't work, always assume output is not a zero exitcode ## type doesn't work on platforms other than linux (bash). If if doesn't work, always assume output is not a zero exitcode
if ! type -p "$BASH" > /dev/null if ! type -p "$BASH" > /dev/null
@ -363,19 +363,19 @@ function GetRemoteOS
then then
CheckConnectivity3rdPartyHosts CheckConnectivity3rdPartyHosts
CheckConnectivityRemoteHost CheckConnectivityRemoteHost
eval "$SSH_CMD \"uname -spio\" > $RUN_DIR/osync_remote_os_$SCRIPT_PID 2>&1" eval "$SSH_CMD \"uname -spio\" > $RUN_DIR/obackup_remote_os_$SCRIPT_PID 2>&1"
child_pid=$! child_pid=$!
WaitForTaskCompletion $child_pid 120 240 WaitForTaskCompletion $child_pid 120 240
retval=$? retval=$?
if [ $retval != 0 ] if [ $retval != 0 ]
then then
eval "$SSH_CMD \"uname -v\" > $RUN_DIR/osync_remote_os_$SCRIPT_PID 2>&1" eval "$SSH_CMD \"uname -v\" > $RUN_DIR/obackup_remote_os_$SCRIPT_PID 2>&1"
child_pid=$! child_pid=$!
WaitForTaskCompletion $child_pid 120 240 WaitForTaskCompletion $child_pid 120 240
retval=$? retval=$?
if [ $retval != 0 ] if [ $retval != 0 ]
then then
eval "$SSH_CMD \"uname\" > $RUN_DIR/osync_remote_os_$SCRIPT_PID 2>&1" eval "$SSH_CMD \"uname\" > $RUN_DIR/obackup_remote_os_$SCRIPT_PID 2>&1"
child_pid=$! child_pid=$!
WaitForTaskCompletion $child_pid 120 240 WaitForTaskCompletion $child_pid 120 240
retval=$? retval=$?
@ -386,7 +386,7 @@ function GetRemoteOS
fi fi
fi fi
REMOTE_OS_VAR=$(cat $RUN_DIR/osync_remote_os_$SCRIPT_PID) REMOTE_OS_VAR=$(cat $RUN_DIR/obackup_remote_os_$SCRIPT_PID)
case $REMOTE_OS_VAR in case $REMOTE_OS_VAR in
*"Linux"*) *"Linux"*)
@ -467,7 +467,7 @@ function RunLocalCommand
if [ $dryrun -ne 0 ] if [ $dryrun -ne 0 ]
then then
Log "Dryrun: Local command [$1] not run." Log "Dryrun: Local command [$1] not run."
return 1 return 0
fi fi
Log "Running command [$1] on local host." Log "Running command [$1] on local host."
eval "$1" > $RUN_DIR/obackup_run_local_$SCRIPT_PID 2>&1 & eval "$1" > $RUN_DIR/obackup_run_local_$SCRIPT_PID 2>&1 &
@ -501,7 +501,7 @@ function RunRemoteCommand
if [ $dryrun -ne 0 ] if [ $dryrun -ne 0 ]
then then
Log "Dryrun: Remote command [$1] not run." Log "Dryrun: Remote command [$1] not run."
return 1 return 0
fi fi
Log "Running command [$1] on remote host." Log "Running command [$1] on remote host."
eval "$SSH_CMD \"$1\" > $RUN_DIR/obackup_run_remote_$SCRIPT_PID 2>&1 &" eval "$SSH_CMD \"$1\" > $RUN_DIR/obackup_run_remote_$SCRIPT_PID 2>&1 &"
@ -1276,18 +1276,18 @@ function Init
if [ "$PARTIAL" == "yes" ] if [ "$PARTIAL" == "yes" ]
then then
SYNC_OPTS=$SYNC_OPTS" --partial --partial-dir=\"$PARTIAL_DIR\"" RSYNC_ARGS=$RSYNC_ARGS" --partial --partial-dir=\"$PARTIAL_DIR\""
RSYNC_EXCLUDE="$RSYNC_EXCLUDE --exclude=\"$PARTIAL_DIR\"" RSYNC_EXCLUDE="$RSYNC_EXCLUDE --exclude=\"$PARTIAL_DIR\""
fi fi
if [ "$DELETE_VANISHED_FILES" == "yes" ] if [ "$DELETE_VANISHED_FILES" == "yes" ]
then then
SYNC_OPTS=$SYNC_OPTS" --delete" RSYNC_ARGS=$RSYNC_ARGS" --delete"
fi fi
if [ $stats -eq 1 ] if [ $stats -eq 1 ]
then then
SYNC_OPTS=$SYNC_OPTS" --stats" RSYNC_ARGS=$RSYNC_ARGS" --stats"
fi fi
## Fix for symlink to directories on target can't get updated ## Fix for symlink to directories on target can't get updated