X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=bin%2Fbackup-script-wrapper;h=456f468df17a819314aec23e04f2a8106ed9bcf7;hb=274b967c3d86e1753286c23c95864ef4658f04ce;hp=482609fa0ea65b6b58722818ccb063c6eb0810d1;hpb=e6ed39f7f7103e43e4560e036e42182a2857c86c;p=backup-script.git

diff --git a/bin/backup-script-wrapper b/bin/backup-script-wrapper
index 482609f..456f468 100755
--- a/bin/backup-script-wrapper
+++ b/bin/backup-script-wrapper
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # backup-script system for cloning systems using rsync
-# Copyright (c)2008-2015 Alexander Barton, alex@barton.de
+# Copyright (c)2008-2016 Alexander Barton, alex@barton.de
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,14 +21,27 @@ if [ -z "$MAILTO" ]; then
 fi
 
 NAME="backup-script"
+
+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"
-DELIMITER="- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
 
 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,6 +49,9 @@ echo
 echo " - Host: `hostname -f`"
 echo " - User: `id -un`"
 echo
+echo "Command:"
+echo "$0" "$@"
+echo
 
 if echo "$DELIMITER" >>"$LOGFILE" 2>/dev/null; then
 	echo >>"$LOGFILE"
@@ -47,7 +63,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