X-Git-Url: https://codewiz.org/gitweb?p=wizbackup.git;a=blobdiff_plain;f=wizbackup;h=fffd3b9f11f08d1440bdbb69bfe3f60221f349e0;hp=39534ac7203b67f96070e7b8666f8fa75183fd55;hb=5c8fab3cdc29ab5b0991579efc8dc516ff73e526;hpb=1b809305fba27877226fe2de759cf9dc889b4b07;ds=sidebyside

diff --git a/wizbackup b/wizbackup
index 39534ac..fffd3b9 100755
--- a/wizbackup
+++ b/wizbackup
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# WizBackup 2.0 - Simple rsync backup with snapshots
+# WizBackup 3.0 - Simple rsync backup with snapshots
 # Based on incremental-backup 0.1 by Matteo Mattei
 #
 # Copyright 2006 Matteo Mattei <matteo.mattei@gmail.com>
@@ -38,7 +38,7 @@ SRC=$1; shift
 # Destination directory (will be created if it doesn't exist)
 DEST=$1; shift
 
-CONF_FILE="/etc/wizbackup/wizbackup.conf"
+CONFIG_FILE="/etc/wizbackup/wizbackup.conf"
 
 # NOTE: --timeout needs to be large enough: if a large dir tree don't change a lot of time can pass without I/O
 # NOTE: --inplace will clobber linked files in older snapshots. DON'T USE IT!
@@ -51,23 +51,23 @@ MONTHS=3
 MIN_FREE_GB=10
 
 RESULT=500
-DATE=$(date +"%Y%m%d")
-if [ $(date +"%d") = 1 ]; then
-	DATE="$DATE-monthly"
-elif [ $(date +"%w") = 0 ]; then
-	DATE="$DATE-weekly"
+DATE="$(date +"%Y%m%d")"
+if [ $(date +"%d") -eq 1 ]; then
+	DATE="${DATE}-monthly"
+elif [ $(date +"%w") -eq 0 ]; then
+	DATE="${DATE}-weekly"
 fi
 DEST="`echo $DEST | sed -e 's/\/$//'`"
 
-if [ -f "$CONF_FILE" ]; then
-	source /etc/wizbackup/wizbackup.conf
+if [ -f "$CONFIG_FILE" ]; then
+	source "$CONFIG_FILE"
 fi
 
 # Use "backup" ssh key with ssh protocol, or password file for rsync protocol
 if [ "${SRC%:*}" == "rsync" ]; then
 	RSYNC_OPTS="$RSYNC_OPTS --password-file=/etc/wizbackup/rsync_password --contimeout 10"
 else
-	export RSYNC_RSH="ssh -i /etc/wizbackup/ssh_id -c arcfour -x -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no"
+	export RSYNC_RSH="ssh -i /etc/wizbackup/ssh_id -x -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no"
 fi
 
 # Error tolerant grep