Exit with code 7 when not all jobs have been run

[backup-script.git] / bin / backup-script-wrapper

diff --git a/bin/backup-script-wrapper b/bin/backup-script-wrapper
index 282cab0fd2156479914f2fc4e026b9e138c94565..62c04b04a14a06db1d477211467168ea9c0bef3b 100755 (executable)
--- 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
@@ -22,21 +22,32 @@ fi
 
 NAME="backup-script"
 HOST=`hostname`
-TMP=`mktemp /tmp/$NAME.XXXXXXXX` || exit 11
+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
 
-echo "$NAME Report" >"$TMP"
-echo >>"$TMP"
-echo " - Host: `hostname -f`" >>"$TMP"
-echo " - User: `id -un`" >>"$TMP"
-echo >>"$TMP"
-
-"$(dirname "$0")/backup-script" "$@" >>"$TMP" 2>&1
+exec >"$TMP" 2>&1
+
+echo "$NAME Report"
+echo
+echo " - Host: `hostname -f`"
+echo " - User: `id -un`"
+echo
+
+if [ -w "$LOGFILE" ]; then
+       "$(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"
 
 rm -f "$TMP"
+exit $r
 
 # -eof-