From 8a87e7effaa72db413f289a89d98507c7d2cffbf Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 23 Jul 2009 17:53:35 +0200 Subject: [PATCH] Move option check below the check for existence of source Signed-off-by: Nico Schottelius --- ccollect.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/ccollect.sh b/ccollect.sh index 5914d95..7c9c54a 100755 --- a/ccollect.sh +++ b/ccollect.sh @@ -282,13 +282,6 @@ while [ "${i}" -lt "${no_sources}" ]; do c_dest="${backup}/destination" c_pre_exec="${backup}/pre_exec" c_post_exec="${backup}/post_exec" - for opt in exclude verbose very_verbose rsync_options summary delete_incomplete remote_host ; do - if [ -f "${backup}/${opt}" -o -f "${backup}/no_${opt}" ]; then - eval c_$opt=\"${backup}/$opt\" - else - eval c_$opt=\"${CDEFAULTS}/$opt\" - fi - done # # Marking backups: If we abort it's not removed => Backup is broken @@ -316,6 +309,17 @@ while [ "${i}" -lt "${no_sources}" ]; do _exit_err "\"${name}\" is not a cconfig-directory. Skipping." fi + # + # Read possible options + # + for opt in exclude verbose very_verbose rsync_options summary delete_incomplete remote_host ; do + if [ -f "${backup}/${opt}" -o -f "${backup}/no_${opt}" ]; then + eval c_$opt=\"${backup}/$opt\" + else + eval c_$opt=\"${CDEFAULTS}/$opt\" + fi + done + # # first execute pre_exec, which may generate destination or other parameters #