X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=bin%2Fbackup-script-wrapper;h=64c9d7d8fef8832d627547010d2c38943ecad0dc;hb=f1e4b99ceb0d87a1f43f03a77a1af2d76fe0ad80;hp=f877a5b912b7c5c882c1ddd50e109717d6c9b840;hpb=985f3c45e7ab15b31e943317385ab84b7436ef90;p=backup-script.git

diff --git a/bin/backup-script-wrapper b/bin/backup-script-wrapper
index f877a5b..64c9d7d 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
@@ -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"
@@ -21,9 +21,12 @@ 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"
+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
@@ -32,19 +35,34 @@ 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" "$@"
 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 - success"
+		;;
+	*)
+		SUBJECT="$SUBJECT - with ERRORS!"
+esac
+
+mail -s "$HOST: $SUBJECT" "$MAILTO" <"$TMP"
 
 rm -f "$TMP"
+exit $r
 
 # -eof-