X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=bin%2Fbackup-script-wrapper;h=925be37c958463a0500274eaefd0df2499f86a2f;hb=1f1ac2b2ee66b81a086c3153fb8c001bc1ef0a12;hp=282cab0fd2156479914f2fc4e026b9e138c94565;hpb=6f11b5a6e921e119cacb84158382c928874925c9;p=backup-script.git

diff --git a/bin/backup-script-wrapper b/bin/backup-script-wrapper
index 282cab0..925be37 100755
--- a/bin/backup-script-wrapper
+++ b/bin/backup-script-wrapper
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/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,22 +21,47 @@ 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"
+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
 
-echo "$NAME Report" >"$TMP"
-echo >>"$TMP"
-echo " - Host: `hostname -f`" >>"$TMP"
-echo " - User: `id -un`" >>"$TMP"
-echo >>"$TMP"
+exec >"$TMP" 2>&1
+
+echo "$NAME Report"
+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"
+	"$(dirname "$0")/backup-script" "$@" | tee -a "$LOGFILE"
+	r=${PIPESTATUS[0]}
+else
+	"$(dirname "$0")/backup-script" "$@"
+	r=$?
+	echo "(Can't write logfile: \"$LOGFILE\"!)"
+fi
 
-"$(dirname "$0")/backup-script" "$@" >>"$TMP" 2>&1
+case "$r" in
+	0)
+		;;
+	*)
+		SUBJECT="$SUBJECT - with ERRORS!"
+esac
 
-cat "$TMP" | mail -s "$HOST: $NAME results" "$MAILTO"
+mail -s "$HOST: $SUBJECT" "$MAILTO" <"$TMP"
 
 rm -f "$TMP"
+exit $r
 
 # -eof-