Default system excludes: Only exclude content, not directory itself

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

diff --git a/bin/backup-script-wrapper b/bin/backup-script-wrapper
index f877a5b912b7c5c882c1ddd50e109717d6c9b840..32a15a66bf40eb7fac8732c2908b7b42a77eac6f 100755 (executable)
--- a/bin/backup-script-wrapper
+++ b/bin/backup-script-wrapper
@@ -21,13 +21,27 @@ if [ -z "$MAILTO" ]; then
 fi
 
 NAME="backup-script"
-HOST=`hostname`
-TMP=`mktemp /tmp/$NAME.XXXXXXXX` || exit 11
-LOGFILE="/var/log/backup-script.log"
+
+DELIMITER="- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
+HOST=`hostname -f`
+LOGFILE="/var/log/$NAME.log"
+PIDFILE="/var/run/$NAME.pid"
+SUBJECT="$NAME results"
+TMP=`mktemp /tmp/$NAME.XXXXXXXX` || exit 1
 
 PATH="$PATH:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
 export PATH
 
+# check PID file ("lock file")
+if [ -e "$PIDFILE" ]; then
+       echo "Lockfile \"$PIDFILE\" already exists."
+       echo "Is an other instance still running?"
+       echo
+       echo -n "Aborted: "; date
+       echo
+       exit 4
+fi
+
 exec >"$TMP" 2>&1
 
 echo "$NAME Report"
@@ -36,15 +50,26 @@ echo " - Host: `hostname -f`"
 echo " - User: `id -un`"
 echo
 
-if [ -w "$LOGFILE" ]; then
+if echo "$DELIMITER" >>"$LOGFILE" 2>/dev/null; then
+       echo >>"$LOGFILE"
        "$(dirname "$0")/backup-script" "$@" | tee -a "$LOGFILE"
+       r=${PIPESTATUS[0]}
 else
        "$(dirname "$0")/backup-script" "$@"
+       r=$?
        echo "(Can't write logfile: \"$LOGFILE\"!)"
 fi
 
-cat "$TMP" | mail -s "$HOST: $NAME results" "$MAILTO"
+case "$r" in
+       0)
+               ;;
+       *)
+               SUBJECT="$SUBJECT - with ERRORS!"
+esac
+
+cat "$TMP" | mail -s "$HOST: $SUBJECT" "$MAILTO"
 
 rm -f "$TMP"
+exit $r
 
 # -eof-