Minor fixes

This commit is contained in:
deajan 2014-03-23 17:46:08 +01:00
parent 4b212311ff
commit bd9664a6ec
2 changed files with 10 additions and 8 deletions

View File

@ -2,7 +2,7 @@
###### Remote (or local) backup script for files & databases ###### Remote (or local) backup script for files & databases
###### (L) 2013 by Ozy de Jong (www.netpower.fr) ###### (L) 2013 by Ozy de Jong (www.netpower.fr)
###### Config file rev 0211201301 ###### Config file rev 0903201401
## ---------- GENERAL BACKUP OPTIONS ## ---------- GENERAL BACKUP OPTIONS
@ -58,7 +58,7 @@ REMOTE_PORT=22
## ssh compression should be used unless your remote connection is good enough (LAN) ## ssh compression should be used unless your remote connection is good enough (LAN)
SSH_COMPRESSION=yes SSH_COMPRESSION=yes
## Remote rsync executable path. Leave this empty in most cases ## Remote rsync executable path. Leave this empty in most cases
REMOTE_RSYNC_PATH="" RSYNC_REMOTE_PATH=""
## Check for connectivity to remote host before launching remote backup tasks. Be sure the hosts responds to ping. Failing to ping will skip current task. ## Check for connectivity to remote host before launching remote backup tasks. Be sure the hosts responds to ping. Failing to ping will skip current task.
REMOTE_HOST_PING=yes REMOTE_HOST_PING=yes

View File

@ -3,7 +3,7 @@
###### Remote (or local) backup script for files & databases ###### Remote (or local) backup script for files & databases
###### (L) 2013 by Orsiris "Ozy" de Jong (www.netpower.fr) ###### (L) 2013 by Orsiris "Ozy" de Jong (www.netpower.fr)
OBACKUP_VERSION=1.84RC3 OBACKUP_VERSION=1.84RC3
OBACKUP_BUILD=1911201301 OBACKUP_BUILD=2303201401
DEBUG=no DEBUG=no
SCRIPT_PID=$$ SCRIPT_PID=$$
@ -227,9 +227,11 @@ function SendAlert
fi fi
else else
Log "WARNING: Cannot send alert email (no mutt / mail present) !!!" Log "WARNING: Cannot send alert email (no mutt / mail present) !!!"
rm -f $RUN_DIR/obackup_lastlog.gz fi
return 1
rm -f $RUN_DIR/obackup_lastlog.gz if -f $RUN_DIR/obackup_lastlog.gz
then
rm $RUN_DIR/obackup_lastlog.gz
fi fi
} }
@ -1170,7 +1172,7 @@ function Init
then then
if [ "$RSYNC_REMOTE_PATH" != "" ] if [ "$RSYNC_REMOTE_PATH" != "" ]
then then
RSYNC_PATH="sudo $(type -p $RSYNC_REMOTE_PATH)/$RSYNC_EXECUTABLE)" RSYNC_PATH="sudo $RSYNC_REMOTE_PATH/$RSYNC_EXECUTABLE"
else else
RSYNC_PATH="sudo $RSYNC_EXECUTABLE" RSYNC_PATH="sudo $RSYNC_EXECUTABLE"
fi fi
@ -1178,7 +1180,7 @@ function Init
else else
if [ "$RSYNC_REMOTE_PATH" != "" ] if [ "$RSYNC_REMOTE_PATH" != "" ]
then then
RSYNC_PATH="$(type -p $RSYNC_REMOTE_PATH)/$RSYNC_EXECUTABLE)" RSYNC_PATH="$RSYNC_REMOTE_PATH/$RSYNC_EXECUTABLE"
else else
RSYNC_PATH="$RSYNC_EXECUTABLE" RSYNC_PATH="$RSYNC_EXECUTABLE"
fi fi