From 1c7f824c194e94494f995d3ab41f5cb68042d876 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@hydrogenium.schottelius.org>
Date: Tue, 25 Apr 2006 15:28:54 +0200
Subject: [PATCH] Removed whitespaces, added Changes

---
 ccollect.sh       | 28 ++++++++++++++--------------
 doc/CHANGES       |  4 +++-
 doc/ccollect.text |  3 +++
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/ccollect.sh b/ccollect.sh
index 5eb0ee9..498c022 100755
--- a/ccollect.sh
+++ b/ccollect.sh
@@ -274,7 +274,7 @@ while [ "$i" -lt "$no_shares" ]; do
       echo "Destination $c_dest does not link to a directory. Skipping"
       exit 1
    fi
-   
+ 
    #
    # pre_exec
    #
@@ -288,42 +288,42 @@ while [ "$i" -lt "$no_shares" ]; do
          exit 1
       fi
    fi
-   
+
    # exclude
    if [ -f "$c_exclude" ]; then
       EXCLUDE="--exclude-from=$c_exclude"
    fi
-   
+ 
    # extra options for rsync
    if [ -f "$c_rsync_extra" ]; then
       RSYNC_EXTRA="$(cat "$c_rsync_extra")"
    fi
-   
+ 
    # Output a summary
    if [ -f "$c_summary" ]; then
       SUMMARY="--stats"
    fi
-   
+ 
    # Verbosity for rsync
    if [ -f "$c_verbose" ]; then
       VERBOSE="-v"
    fi
-   
+ 
    # MORE verbosity, includes standard verbosity
    if [ -f "$c_vverbose" ]; then
       VERBOSE="-v"
       VVERBOSE="-v"
    fi
-   
+ 
    #
    # check if maximum number of backups is reached, if so remove
    #
-   
+ 
    # the created directories are named $INTERVALL.$DA
    count=$(ls -d "$c_dest/${INTERVALL}."?*  2>/dev/null | wc -l)
    echo -n "Currently $count backup(s) exist(s),"
    echo " total keeping $c_intervall backup(s)."
-   
+ 
    if [ "$count" -ge "$c_intervall" ]; then
       substract=$(echo $c_intervall - 1 | bc)
       remove=$(echo $count - $substract | bc)
@@ -336,16 +336,16 @@ while [ "$i" -lt "$no_shares" ]; do
          rm $VVERBOSE -rf "$dir"
       done < "$TMP"
    fi
-   
+ 
    #
    # clone the old directory with hardlinks
    #
 
    destination_date=$(date +%Y-%m-%d-%H%M)
    destination_dir="$c_dest/${INTERVALL}.${destination_date}.$$"
-   
+ 
    last_dir=$(ls -d "$c_dest/${INTERVALL}."?* 2>/dev/null | sort -n | tail -n 1)
-   
+ 
    # give some info
    echo "Beginning to backup, this may take some time..."
 
@@ -371,7 +371,7 @@ while [ "$i" -lt "$no_shares" ]; do
    # the rsync part
    # options partly stolen from rsnapshot
    #
-   
+ 
    echo "$(date) Transferring files..."
 
    rsync -a $VERBOSE $RSYNC_EXTRA $EXCLUDE $SUMMARY \
@@ -425,7 +425,7 @@ if [ -x "$CPOSTEXEC" ]; then
    echo "Executing $CPOSTEXEC ..."
    "$CPOSTEXEC"
    echo "Finished ${CPOSTEXEC}."
-   
+ 
    if [ $? -ne 0 ]; then
       echo "$CPOSTEXEC failed."
    fi
diff --git a/doc/CHANGES b/doc/CHANGES
index 8fbf671..184f3ae 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -2,13 +2,15 @@
    * `pax` (Posix) is now required, `cp -al` (GNU specific) is removed
    * "interval" was written with two 'l' (ell), which is wrong in English
    * Changed the name of backup directories, removed the colon in the interval
+   * ccollect will now exit, when preexec returns non-zero
+   * ccollect now reports when postexec returns non-zero
 
 0.3.2 to 0.3.3:
    * Fix a small bug, which suppressed information when rsync exits non-zero
 
 0.3.1 to 0.3.2:
    * ccollect now prints the start time, end time and duration of the backup
-   
+
 0.3 to 0.3.1:
    * added support for printing a summary
    * some cosmetic changes
diff --git a/doc/ccollect.text b/doc/ccollect.text
index 96c79aa..6198611 100644
--- a/doc/ccollect.text
+++ b/doc/ccollect.text
@@ -47,6 +47,9 @@ versions:
 - `pax` (Posix) is now required, `cp -al` (GNU specific) is removed
 - "interval" was written with two 'l' (ell), which is wrong in English
 - Changed the name of backup directories, removed the colon in the interval
+- ccollect will now exit, when preexec returns non-zero
+- ccollect now reports when postexec returns non-zero
+
 
 
 Requirements