X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=bin%2Fbackup-script-wrapper;h=32a15a66bf40eb7fac8732c2908b7b42a77eac6f;hb=80655038fee8d0c5a994e358865344b28398ac92;hp=62c04b04a14a06db1d477211467168ea9c0bef3b;hpb=566dfc1852216acad83272d9216858f44d5ce26f;p=backup-script.git

diff --git a/bin/backup-script-wrapper b/bin/backup-script-wrapper
index 62c04b0..32a15a6 100755
--- a/bin/backup-script-wrapper
+++ b/bin/backup-script-wrapper
@@ -21,13 +21,27 @@ if [ -z "$MAILTO" ]; then
 fi
 
 NAME="backup-script"
-HOST=`hostname`
+
+DELIMITER="- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
+HOST=`hostname -f`
+LOGFILE="/var/log/$NAME.log"
+PIDFILE="/var/run/$NAME.pid"
+SUBJECT="$NAME results"
 TMP=`mktemp /tmp/$NAME.XXXXXXXX` || exit 1
-LOGFILE="/var/log/backup-script.log"
 
 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,7 +50,8 @@ 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
@@ -45,7 +60,14 @@ else
 	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