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.
This commit is contained in:
parent
c313ac8f49
commit
0e07585772
2 changed files with 10 additions and 5 deletions
10
ccollect.sh
10
ccollect.sh
|
@ -14,8 +14,8 @@ CPREEXEC="$CDEFAULTS/pre_exec"
|
||||||
CPOSTEXEC="$CDEFAULTS/post_exec"
|
CPOSTEXEC="$CDEFAULTS/post_exec"
|
||||||
|
|
||||||
TMP=$(mktemp /tmp/$(basename $0).XXXXXX)
|
TMP=$(mktemp /tmp/$(basename $0).XXXXXX)
|
||||||
VERSION=0.4.2
|
VERSION=0.4.3
|
||||||
RELEASE="2006-06-17"
|
RELEASE="2006-XX-XX"
|
||||||
HALF_VERSION="ccollect $VERSION"
|
HALF_VERSION="ccollect $VERSION"
|
||||||
FULL_VERSION="ccollect $VERSION ($RELEASE)"
|
FULL_VERSION="ccollect $VERSION ($RELEASE)"
|
||||||
|
|
||||||
|
@ -403,9 +403,9 @@ while [ "$i" -lt "$no_sources" ]; do
|
||||||
|
|
||||||
echo "$($DDATE) Transferring files..."
|
echo "$($DDATE) Transferring files..."
|
||||||
|
|
||||||
rsync -a $VERBOSE $RSYNC_EXTRA $EXCLUDE $SUMMARY \
|
rsync -a --delete --numeric-ids --relative --delete-excluded \
|
||||||
--delete --numeric-ids --relative --delete-excluded \
|
$VERBOSE $EXCLUDE $SUMMARY $RSYNC_EXTRA \
|
||||||
"$source" "$abs_destination_dir"
|
"$source" "$abs_destination_dir"
|
||||||
|
|
||||||
if [ "$?" -ne 0 ]; then
|
if [ "$?" -ne 0 ]; then
|
||||||
echo "rsync reported error $?. The backup may be broken (see rsync errors)"
|
echo "rsync reported error $?. The backup may be broken (see rsync errors)"
|
||||||
|
|
|
@ -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:
|
0.4.1 to 0.4.2:
|
||||||
* fixed bug when $CCOLLECT_CONF is relative
|
* fixed bug when $CCOLLECT_CONF is relative
|
||||||
* added Quickstart to documentation
|
* added Quickstart to documentation
|
||||||
|
|
Loading…
Reference in a new issue