From 0e075857728feaf66b914d076da6a99d19df250b Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@hydrogenium.schottelius.org>
Date: Tue, 5 Sep 2006 21:41:12 +0200
Subject: [PATCH] Allow overriding of rsync options

Moving $RSYNC_EXTRA to the end of options, so users can override
the default options.

This hint was brought to me by Marcus Wagner.
---
 ccollect.sh | 10 +++++-----
 doc/CHANGES |  5 +++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ccollect.sh b/ccollect.sh
index 4845a06..e94cb82 100755
--- a/ccollect.sh
+++ b/ccollect.sh
@@ -14,8 +14,8 @@ CPREEXEC="$CDEFAULTS/pre_exec"
 CPOSTEXEC="$CDEFAULTS/post_exec"
 
 TMP=$(mktemp /tmp/$(basename $0).XXXXXX)
-VERSION=0.4.2
-RELEASE="2006-06-17"
+VERSION=0.4.3
+RELEASE="2006-XX-XX"
 HALF_VERSION="ccollect $VERSION"
 FULL_VERSION="ccollect $VERSION ($RELEASE)"
 
@@ -403,9 +403,9 @@ while [ "$i" -lt "$no_sources" ]; do
  
    echo "$($DDATE) Transferring files..."
 
-   rsync -a $VERBOSE $RSYNC_EXTRA $EXCLUDE $SUMMARY \
-      --delete --numeric-ids --relative --delete-excluded \
-      "$source" "$abs_destination_dir"
+   rsync -a --delete --numeric-ids --relative --delete-excluded   \
+         $VERBOSE $EXCLUDE $SUMMARY $RSYNC_EXTRA                  \
+         "$source" "$abs_destination_dir"
    
    if [ "$?" -ne 0 ]; then
       echo "rsync reported error $?. The backup may be broken (see rsync errors)"
diff --git a/doc/CHANGES b/doc/CHANGES
index 1f1a23e..0a0b929 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,8 @@
+0.4.2 to 0.4.3:
+   * Display error code of rsync, if non-zero (for further analysis)
+   * Fix Makefile, so 'make install' works on others OS
+   * reorder $RSYNC_EXTRA, so it can be overriden by users
+
 0.4.1 to 0.4.2:
    * fixed bug when $CCOLLECT_CONF is relative
    * added Quickstart to documentation