Fix backup-status not showing result code for successful backups

[backup-script.git] / bin / backup-script

diff --git a/bin/backup-script b/bin/backup-script
index 5c070261358369d1ef1f36652ea877878ac19023..494efca1dfa37a818d913e06797ea48ca56cc136 100755 (executable)
--- a/bin/backup-script
+++ b/bin/backup-script
@@ -31,7 +31,9 @@ destinations=""
        || conf_d="/etc/backup-script.d"
 pre_exec=""
 post_exec=""
+default_backup_type="rsync"
 default_source_root="/"
+default_files="running-config"
 default_target="/var/backups"
 default_user="root"
 default_ssh_args_add=""
@@ -371,8 +373,10 @@ for f in $sys; do
 
        # Set global defaults
        system="$fname"
+       backup_type="$default_backup_type"
        user="$default_user"
        source_root="$default_source_root"
+       files="$default_files"
        target="$default_target"
        ssh_args_add="$default_ssh_args_add"
        rsync_args_add="$default_rsync_args_add"
@@ -538,41 +542,52 @@ for f in $sys; do
        fi
 
        # prepare (remote) command ...
-       cmd="$rsync --archive"
-       [ "$compress" -ne 0 ] && cmd="$cmd --compress"
-       [ "$local" -eq 0 ] && cmd="$cmd --rsh=\"$ssh_cmd\""
-       cmd="$cmd --delete --delete-excluded --sparse"
-       if [ "$VERBOSE" -gt 0 ]; then
-               [ "$rsync_proto" -ge 31 ] \
-                       && cmd="$cmd --info=progress2" \
-                       || cmd="$cmd --progress"
-       fi
-       if [ "$source_root" = "$default_source_root" ]; then
-               for dir in \
-                       "/dev/**" \
-                       "/media/**" \
-                       "/mnt/**" \
-                       "/net/**" \
-                       "/proc/**" \
-                       "/run/**" \
-                       "/sys/**" \
-                       "/tmp/**" \
-                       "/var/cache/apt/**" \
-                       "/var/log/**" \
-                       "/var/tmp/**" \
-               ; do
+       if [[ "$backup_type" == "rsync" ]]; then
+               cmd="$rsync --archive"
+               [ "$compress" -ne 0 ] && cmd="$cmd --compress"
+               [ "$local" -eq 0 ] && cmd="$cmd --rsh=\"$ssh_cmd\""
+               cmd="$cmd --delete --delete-excluded --sparse"
+               if [ "$VERBOSE" -gt 0 ]; then
+                       [ "$rsync_proto" -ge 31 ] \
+                               && cmd="$cmd --info=progress2" \
+                               || cmd="$cmd --progress"
+               fi
+               if [ "$source_root" = "$default_source_root" ]; then
+                       for dir in \
+                               "/dev/**" \
+                               "/media/**" \
+                               "/mnt/**" \
+                               "/net/**" \
+                               "/proc/**" \
+                               "/run/**" \
+                               "/sys/**" \
+                               "/tmp/**" \
+                               "/var/cache/apt/**" \
+                               "/var/log/**" \
+                               "/var/tmp/**" \
+                       ; do
+                               cmd="$cmd --exclude=$dir"
+                       done
+               fi
+               [ -n "$exclude_args_add" ] && cmd="$cmd $exclude_args_add"
+               for dir in $exclude_dirs_add; do
                        cmd="$cmd --exclude=$dir"
                done
+               [ -n "$rsync_args_add" ] && cmd="$cmd $rsync_args_add"
+
+               [ "$local" -eq 0 ] \
+                       && cmd="$cmd ${user}@${system}:$source_root $sys_target/" \
+                       || cmd="$cmd $source_root $sys_target/"
+       elif [[ "$backup_type" == "scp" ]]; then
+               cmd="scp"
+               [ "$VERBOSE" -eq 0 ] && cmd="$cmd -q"
+               for file in $files; do
+                       cmd="$cmd ${user}@${system}:$file $sys_target/"
+               done
+       else
+               echo "Backup type \"$backup_type\" undefined, \"$system\" skipped!"
+               echo; continue
        fi
-       [ -n "$exclude_args_add" ] && cmd="$cmd $exclude_args_add"
-       for dir in $exclude_dirs_add; do
-               cmd="$cmd --exclude=$dir"
-       done
-       [ -n "$rsync_args_add" ] && cmd="$cmd $rsync_args_add"
-
-       [ "$local" -eq 0 ] \
-               && cmd="$cmd ${user}@${system}:$source_root $sys_target/" \
-               || cmd="$cmd $source_root $sys_target/"
 
        echo "Backing up to \"$sys_target\" ..."
        echo -n "Start date: "; date
@@ -581,11 +596,22 @@ for f in $sys; do
        ok=0
 
        if [ "$DRYRUN" -eq 0 ]; then
-               rm -f "$sys_target/.stamp"
+               stamp_file="$sys_target/.stamp"
+               rm -f "$stamp_file"
+
+               # Execute backup command:
+               start_t=$(date "+%s")
                $SHELL -c "$cmd"; ret=$?
-               echo "code=$ret" >"$sys_target/.stamp"
+               end_t=$(date "+%s")
+
+               echo "code=$ret" >"$stamp_file"
+               echo "start_t=$start_t" >>"$stamp_file"
+               echo "end_t=$end_t" >>"$stamp_file"
+               echo "cmd='$cmd'" >>"$stamp_file"
+               echo "backup_host='`hostname -f`'" >>"$stamp_file"
+               echo "backup_user='`id -un`'" >>"$stamp_file"
        else
-               echo " *** Trial run, not executing synchronization command!"
+               echo " *** Trial run, not executing save command!"
                ret=0
        fi