Move option check below the check for existence of source
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
This commit is contained in:
parent
f5e1920a15
commit
8a87e7effa
1 changed files with 11 additions and 7 deletions
18
ccollect.sh
18
ccollect.sh
|
@ -282,13 +282,6 @@ while [ "${i}" -lt "${no_sources}" ]; do
|
||||||
c_dest="${backup}/destination"
|
c_dest="${backup}/destination"
|
||||||
c_pre_exec="${backup}/pre_exec"
|
c_pre_exec="${backup}/pre_exec"
|
||||||
c_post_exec="${backup}/post_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
|
# 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."
|
_exit_err "\"${name}\" is not a cconfig-directory. Skipping."
|
||||||
fi
|
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
|
# first execute pre_exec, which may generate destination or other parameters
|
||||||
#
|
#
|
||||||
|
|
Loading…
Reference in a new issue