X-Git-Url: https://git.llucax.com/software/bacap.git/blobdiff_plain/777f7ddb3be51362f461b37093bda5417f800a38..5b3f492851eb2f1335f3d2654cce156aab7b45a8:/bacap?ds=sidebyside

diff --git a/bacap b/bacap
index 8c649ed..5b74c5e 100755
--- a/bacap
+++ b/bacap
@@ -41,7 +41,7 @@ RSYNC_FLAGS="-aAXHx --numeric-ids --delete"
 RSYNC_VERBOSE_FLAGS="-v --stats"
 
 # rsync remote shell to use
-RSYNC_RSH="ssh -c arcfour -o Compression=no -x"
+RSYNC_RSH="ssh"
 
 #_INCLUDE_END_
 
@@ -66,8 +66,8 @@ run=
 	RSYNC_FLAGS="$RSYNC_FLAGS $RSYNC_VERBOSE_FLAGS"
 [ $DEBUG -eq 1 ] &&
 	V=-v
+exec 3>&2
 [ -n "$LOG_FILE" ] &&
-	exec 3>&2 &&
 	exec 1>>"$LOG_FILE" &&
 	exec 2>>"$LOG_FILE"
 
@@ -103,6 +103,7 @@ do
 	source "$host_path/bacaprc" 2>/dev/null
 	host=`basename "$host_path"`
 	host_backup_path="$BACKUP_PATH/$host"
+	mkdir -p $host_backup_path
 	dst="$BACKUP_PATH/$host/$date"
 	src=`cat "$host_path/paths"`
 	[ "$host" != "$LOCALHOST" ] &&
@@ -134,7 +135,7 @@ do
 				--link-dest="$current_dir" $src "$dst/" ||
 		ret=$(($ret+1))
 	plog "Moving current..."
-	$run rm $V "$current_link" ||
+	$run rm -f $V "$current_link" ||
 		ret=$(($ret+1))
 	$run ln -s $V "$date" "$current_link" ||
 		ret=$(($ret+1))
@@ -150,10 +151,14 @@ plog "========================================================================="
 
 if [ $ret -ne 0 ]
 then
-	pout "There were some errors when running the backup on: $ERROR_HOSTS"
 	pout
-	pout "Please take a look at the log: $LOG_FILE"
+	pout "There were some errors when running the backup on: $ERROR_HOSTS"
 	pout
+	if [ -n "$LOG_FILE" ]
+	then
+		pout "Please take a look at the log: $LOG_FILE"
+		pout
+	fi
 fi
 
 exit $ret