X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=bin%2Fbackup-script-wrapper;h=32a15a66bf40eb7fac8732c2908b7b42a77eac6f;hb=0e6655b06da00203ce0eabc115f8e0908edf8ce5;hp=8ae3fc800e695461ac587366c3a3acea327cd5b8;hpb=e98192a7f819daa06b50ef681183ab51d04a440f;p=backup-script.git

diff --git a/bin/backup-script-wrapper b/bin/backup-script-wrapper
index 8ae3fc8..32a15a6 100755
--- a/bin/backup-script-wrapper
+++ b/bin/backup-script-wrapper
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # backup-script system for cloning systems using rsync
 # Copyright (c)2008-2015 Alexander Barton, alex@barton.de
@@ -21,12 +21,27 @@ if [ -z "$MAILTO" ]; then
 fi
 
 NAME="backup-script"
-HOST=`hostname`
-TMP=`mktemp /tmp/$NAME.XXXXXXXX` || exit 11
+
+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"
@@ -35,10 +50,26 @@ echo " - Host: `hostname -f`"
 echo " - User: `id -un`"
 echo
 
-"$(dirname "$0")/backup-script" "$@"
+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
+
+case "$r" in
+	0)
+		;;
+	*)
+		SUBJECT="$SUBJECT - with ERRORS!"
+esac
 
-cat "$TMP" | mail -s "$HOST: $NAME results" "$MAILTO"
+cat "$TMP" | mail -s "$HOST: $SUBJECT" "$MAILTO"
 
 rm -f "$TMP"
+exit $r
 
 # -eof-