Fix typo (thank Rayis for the report!)

[software/bacap.git] / bacap

diff --git a/bacap b/bacap
index 42273ab52abe262754e39a236da545793d9c7ded..976ee08aa410b5046bde8399ca6e1a71a1b8385c 100755 (executable)
--- a/bacap
+++ b/bacap
@@ -12,6 +12,9 @@ DEBUG=0
 # Don't actually do anything, just print the commands
 DRY_RUN=0
 
+# Force synchronization, even when the target already exist
+FORCE_SYNC=0
+
 # Log file (if empty, print to stdout/err)
 LOG_FILE=
 
@@ -27,14 +30,18 @@ BACKUP_PATH=/backup
 # Date format used for backed up directories (passed to the date command)
 DATE_FMT="%Y-%m-%d"
 
+# Ping remote hosts to check if they are up (set to 0 if your hosts don't
+# reply to ICMP pings).
+PING_CHECK=1
+
 # rsync flags to use
-RSYNC_FLAGS="-aAXHx --numeric-ids --delete"
+RSYNC_FLAGS="-aAHSXx --numeric-ids"
 
 # rsync flags to use when in verbose mode
 RSYNC_VERBOSE_FLAGS="-v --stats"
 
 # rsync remote shell to use
-RSYNC_RSH="ssh -c arcfour -o Compression=no -x"
+RSYNC_RSH="ssh"
 
 #_INCLUDE_END_
 
@@ -59,8 +66,8 @@ run=
        RSYNC_FLAGS="$RSYNC_FLAGS $RSYNC_VERBOSE_FLAGS"
 [ $DEBUG -eq 1 ] &&
        V=-v
+exec 3>&2
 [ -n "$LOG_FILE" ] &&
-       exec 3>&2 &&
        exec 1>>"$LOG_FILE" &&
        exec 2>>"$LOG_FILE"
 
@@ -77,7 +84,7 @@ perror() {
        echo "$@" >&2
 }
 
-host_up() {
+ping_host() {
        ping -c1 "$1" > /dev/null 2>&1
 }
 
@@ -96,6 +103,7 @@ do
        source "$host_path/bacaprc" 2>/dev/null
        host=`basename "$host_path"`
        host_backup_path="$BACKUP_PATH/$host"
+       mkdir -p $host_backup_path
        dst="$BACKUP_PATH/$host/$date"
        src=`cat "$host_path/paths"`
        [ "$host" != "$LOCALHOST" ] &&
@@ -106,35 +114,51 @@ do
        current_dir="$host_backup_path/`readlink \"$current_link\"`"
        extra_flags=
        plog "-----------------------------------------------------------------"
-       plog "Backup for host $host"
+       plog "Backup for host $host started at `date '+%Y-%m-%d %H:%M:%S'`"
        plog "-----------------------------------------------------------------"
        plog "Source:      $src"
        plog "Destination: $dst"
        plog "Last:        $current_dir"
        plog
-       [ -d "$dst" ] &&
+       [ -d "$dst" ] && [ "$FORCE_SYNC" -ne 1 ] &&
                perror "$dst already exists, skipping..." &&
                continue
-       ! host_up $host &&
+       [ "$PING_CHECK" -eq 1 ] && ! ping_host $host &&
                perror "$host is down, skipping..." &&
                continue
        [ -r "$exclude" ] &&
-               extra_flags="--exclude-from=$exclude --delete-excluded"
+               extra_flags="--exclude-from=$exclude"
        [ -r "$include" ] &&
                extra_flags="$extra_flags --include-from=$include"
-       plog "Rotating backup..."
-       $run cp -al $V "$current_dir" "$dst" ||
-               ret=$(($ret+1))
        plog "Running rsync..."
-       $run rsync $RSYNC_FLAGS $extra_flags $src "$dst/" ||
-               ret=$(($ret+1))
-       plog "Moving current..."
-       $run rm $V "$current_link" ||
+       $run rsync $RSYNC_FLAGS $extra_flags \
+                               --link-dest="$current_dir" $src "$dst/"
+       rsync_ret=$?
+       case $rsync_ret in
+               0)
+                       # Normal return
+                       ;;
+               24)
+                       # Ignore error 24 from rsync ("Partial transfer due to
+                       # vanished source files") which is somewhat expected
+                       # since we don't do a snapshot
+                       ;;
+               *)
+                       # Any other error is important enough
+                       ret=$(($ret+1))
+                       ;;
+       esac
+
+       if [ $ret -eq $saved_ret ]
+       then
+               # Only move current if rsync did not fail, to avoid dangling
+               # symlinks
+               plog "Moving current..."
+               $run rm -f $V "$current_link" ||
                ret=$(($ret+1))
-       $run ln -s $V "$date" "$current_link" ||
+               $run ln -s $V "$date" "$current_link" ||
                ret=$(($ret+1))
-       if [ $ret -ne $saved_ret ]
-       then
+       else
                ERROR_HOSTS="$ERROR_HOSTS $host"
        fi
 done
@@ -145,10 +169,14 @@ plog "========================================================================="
 
 if [ $ret -ne 0 ]
 then
-       pout "There were some errors when running the backup on: $ERROR_HOSTS"
        pout
-       pout "Please take a look at the log: $LOG_FILE"
+       pout "There were some errors when running the backup on: $ERROR_HOSTS"
        pout
+       if [ -n "$LOG_FILE" ]
+       then
+               pout "Please take a look at the log: $LOG_FILE"
+               pout
+       fi
 fi
 
 exit $ret