From cbf1b7cf0e30f1cab9b96e20a81791b75e31abf7 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@ikn.schottelius.org>
Date: Mon, 27 Jul 2009 09:17:06 +0200
Subject: [PATCH] Simplify error printing, if quiet_if_down is set

Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
---
 ccollect.sh | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/ccollect.sh b/ccollect.sh
index e7ac7fb..c07852a 100755
--- a/ccollect.sh
+++ b/ccollect.sh
@@ -335,12 +335,10 @@ while [ "${i}" -lt "${no_sources}" ]; do
    # Verify source is up and accepting connections before deleting any old backups
    #
    if ! rsync "${source}" >/dev/null 2>"${TMP}" ; then
-      if [ -f "${c_quiet_if_down}" ]; then
-         _exit_err "Source ${source} is not readable. Skipping."
-      else
+      if [ ! -f "${c_quiet_if_down}" ]; then
          cat "${TMP}"
-         _exit_err "Error: source ${source} is not readable. Skipping."
       fi
+      _exit_err "Source ${source} is not readable. Skipping."
    fi
 
    #
@@ -375,10 +373,9 @@ while [ "${i}" -lt "${no_sources}" ]; do
    #
    ( pcmd cd "$ddir" ) || _exit_err "Cannot change to ${ddir}. Skipping."
 
-   # NEW method as of 0.6:
-   # - insert ccollect default parameters
-   # - insert options
-   # - insert user options
+   #
+   # Parameters: ccollect defaults, configuration options, user options
+   #
 
    #
    # rsync standard options