X-Git-Url: https://codewiz.org/gitweb?p=wizbackup.git;a=blobdiff_plain;f=wizbackup-driver;h=6fbc2fdd2c257eb393d2668d1e99b104f7729638;hp=abda39ef496ef905794755a4dc3064f54ccacc6d;hb=8c5171836be85d47ed5399447c75167d9eb58399;hpb=251e43821723f401618f4b3544676adb553dbb53

diff --git a/wizbackup-driver b/wizbackup-driver
index abda39e..6fbc2fd 100755
--- a/wizbackup-driver
+++ b/wizbackup-driver
@@ -17,9 +17,9 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-if [ $# -lt 1 ]
+if [ $# -lt 2 ]
 then
-	echo "Usage: $0 [MACHINE-TAB]"
+	echo "Usage: $0 [MACHINE-TAB] [DEST]"
 	echo
 	echo "The MACHINE-TAB file contains hostnames of machines to be backed up, one per line."
 	echo "Empty lines and lines starting with '#' are ignored."
@@ -27,12 +27,12 @@ then
 fi
 
 HOSTS=`cat $1 | egrep -v '^#|^ *$'`
+DEST="$2"
 
 LOGGROUP=`basename $1`
 LOGDIR=/var/log/wizbackup
 LOCKDIR=/var/lock/wizbackup
-EXCLUDES_DIR=/root/rsync-backups/exclude
-DEST=/backup
+EXCLUDES_DIR="$DEST/EXCLUDE"
 
 today=`date +"%Y%m%d"`
 mkdir -p $LOGDIR
@@ -45,17 +45,17 @@ else
 fi
 
 for host in $HOSTS; do
-	opts="--exclude-from $EXCLUDES_DIR/ALWAYS"
-	if [ -f "$EXCLUDES_DIR/$host" ]; then
-		opts="$opts --exclude-from $EXCLUDES_DIR/$host"
-	fi
+	opts=""
+	for file in "$EXCLUDES_DIR/ALWAYS" "$EXCLUDES_DIR/$host"; do
+		[ -f $file ] && opts="$opts --exclude-from $file"
+	done
 
 	start_time=$(date +%s)
 	flock $LOCKDIR/$host wizbackup "$host:/" "$DEST/$host/" $opts >>$LOGFILE 2>&1
 	result=$?
 	end_time=$(date +%s)
 
-	report="$(date):$host:$(($end_time-$start_time)):$result"
+	report="$(date +%s):$host:$(($end_time-$start_time)):$result"
 	echo $report >>$LOGDIR/$LOGGROUP-report-$today.log
 	[ $result != 0 ] && echo "$report" >>$LOGDIR/$LOGGROUP-fail-$today.log
 done