Respect "dry run mode" when continuing snapshots

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

diff --git a/bin/backup-script-wrapper b/bin/backup-script-wrapper
index 2e07bc8860fc9753cbbf6b75e283c4f04380f8d4..64c9d7d8fef8832d627547010d2c38943ecad0dc 100755 (executable)
--- a/bin/backup-script-wrapper
+++ b/bin/backup-script-wrapper
@@ -13,7 +13,7 @@
 if [ -z "$MAILTO" ]; then
        if id "logcheck" >/dev/null 2>&1; then
                MAILTO="logcheck"
-       elif fgrep "logcheck:" /etc/aliases >/dev/null 2>&1; then
+       elif grep -F "logcheck:" /etc/aliases >/dev/null 2>&1; then
                MAILTO="logcheck"
        else
                MAILTO="root"
@@ -23,10 +23,10 @@ fi
 NAME="backup-script"
 
 DELIMITER="- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
-HOST=`hostname -f`
+HOST=$(hostname -f)
 LOGFILE="/var/log/$NAME.log"
 SUBJECT="$NAME results"
-TMP=`mktemp /tmp/$NAME.XXXXXXXX` || exit 1
+TMP=$(mktemp /tmp/$NAME.XXXXXXXX) || exit 1
 
 PATH="$PATH:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
 export PATH
@@ -35,8 +35,8 @@ exec >"$TMP" 2>&1
 
 echo "$NAME Report"
 echo
-echo " - Host: `hostname -f`"
-echo " - User: `id -un`"
+echo " - Host: $(hostname -f)"
+echo " - User: $(id -un)"
 echo
 echo "Command:"
 echo "$0" "$@"
@@ -54,12 +54,13 @@ fi
 
 case "$r" in
        0)
+               SUBJECT="$SUBJECT - success"
                ;;
        *)
                SUBJECT="$SUBJECT - with ERRORS!"
 esac
 
-cat "$TMP" | mail -s "$HOST: $SUBJECT" "$MAILTO"
+mail -s "$HOST: $SUBJECT" "$MAILTO" <"$TMP"
 
 rm -f "$TMP"
 exit $r