move pre_exec part to the top
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
This commit is contained in:
parent
49cb1f92ee
commit
ccf86defaf
1 changed files with 17 additions and 16 deletions
33
ccollect.sh
33
ccollect.sh
|
@ -270,6 +270,11 @@ while [ "${source_no}" -lt "${no_sources}" ]; do
|
|||
#
|
||||
(
|
||||
backup="${CSOURCES}/${name}"
|
||||
c_source="${backup}/source"
|
||||
c_dest="${backup}/destination"
|
||||
c_pre_exec="${backup}/pre_exec"
|
||||
c_post_exec="${backup}/post_exec"
|
||||
|
||||
#
|
||||
# Stderr to stdout, so we can produce nice logs
|
||||
#
|
||||
|
@ -296,12 +301,19 @@ while [ "${source_no}" -lt "${no_sources}" ]; do
|
|||
fi
|
||||
|
||||
#
|
||||
# Read / create configuration
|
||||
# First execute pre_exec, which may generate destination or other parameters
|
||||
#
|
||||
if [ -x "${c_pre_exec}" ]; then
|
||||
_techo "Executing ${c_pre_exec} ..."
|
||||
"${c_pre_exec}"; ret="$?"
|
||||
_techo "Finished ${c_pre_exec} (return code ${ret})."
|
||||
|
||||
[ "${ret}" -eq 0 ] || _exit_err "${c_pre_exec} failed. Skipping."
|
||||
fi
|
||||
|
||||
#
|
||||
# Read source configuration
|
||||
#
|
||||
c_source="${backup}/source"
|
||||
c_dest="${backup}/destination"
|
||||
c_pre_exec="${backup}/pre_exec"
|
||||
c_post_exec="${backup}/post_exec"
|
||||
for opt in verbose very_verbose summary exclude rsync_options \
|
||||
delete_incomplete remote_host rsync_failure_codes \
|
||||
mtime quiet_if_down ; do
|
||||
|
@ -321,17 +333,6 @@ while [ "${source_no}" -lt "${no_sources}" ]; do
|
|||
TSORT="tc"
|
||||
fi
|
||||
|
||||
#
|
||||
# First execute pre_exec, which may generate destination or other parameters
|
||||
#
|
||||
if [ -x "${c_pre_exec}" ]; then
|
||||
_techo "Executing ${c_pre_exec} ..."
|
||||
"${c_pre_exec}"; ret="$?"
|
||||
_techo "Finished ${c_pre_exec} (return code ${ret})."
|
||||
|
||||
[ "${ret}" -eq 0 ] || _exit_err "${c_pre_exec} failed. Skipping."
|
||||
fi
|
||||
|
||||
#
|
||||
# Source configuration checks
|
||||
#
|
||||
|
|
Loading…
Reference in a new issue