ungleich-public/ccollect
6
0
Fork 1
Code Issues Pull requests 1 Projects Releases Wiki Activity

Only check configuration options, if the base is exitsing

Browse source 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
This commit is contained in:
Nico Schottelius 2009-07-27 09:06:01 +02:00
parent 65c34deb43
commit d61c9625f4
1 changed files with 23 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
ccollect.sh
View file

@ -202,11 +202,8 @@ else
while [ "$#" -ge 1 ]; do while [ "$#" -ge 1 ]; do
eval arg=\"\$1\"; shift eval arg=\"\$1\"; shift
eval source_${no_sources}=\"${arg}\" eval export source_${no_sources}=\"${arg}\"
no_sources="$((${no_sources}+1))" no_sources="$((${no_sources}+1))"
# make variable available for subscripts
eval export source_${no_sources}
done done
fi fi
@ -261,7 +258,27 @@ while [ "${i}" -lt "${no_sources}" ]; do
exec 2>&1 exec 2>&1
# #
# Configuration # Record start of backup: internal and for the user
#
begin_s="$(date +%s)"
_techo "Beginning to backup"
#
# Standard configuration checks
#
if [ ! -e "${backup}" ]; then
_exit_err "Source does not exist."
fi
#
# Configuration _must_ be a directory (cconfig style)
#
if [ ! -d "${backup}" ]; then
_exit_err "\"${name}\" is not a cconfig-directory. Skipping."
fi
#
# Read Configuration
# #
backup="${CSOURCES}/${name}" backup="${CSOURCES}/${name}"
c_source="${backup}/source" c_source="${backup}/source"
@ -270,7 +287,7 @@ while [ "${i}" -lt "${no_sources}" ]; do
c_post_exec="${backup}/post_exec" c_post_exec="${backup}/post_exec"
for opt in exclude verbose very_verbose rsync_options summary delete_incomplete \ for opt in exclude verbose very_verbose rsync_options summary delete_incomplete \
remote_host rsync_failure_codes mtime quiet_if_down ; do remote_host rsync_failure_codes mtime quiet_if_down ; do
if [ -f "${backup}/$opt" -o -f "${backup}/no_$opt" ]; then if [ -f "${backup}/${opt}" -o -f "${backup}/no_${opt}" ]; then
eval c_$opt=\"${backup}/$opt\" eval c_$opt=\"${backup}/$opt\"
else else
eval c_$opt=\"${CDEFAULTS}/$opt\" eval c_$opt=\"${CDEFAULTS}/$opt\"
@ -289,27 +306,6 @@ while [ "${i}" -lt "${no_sources}" ]; do
# #
c_marker=".ccollect-marker" c_marker=".ccollect-marker"
#
# Times
#
begin_s="$(date +%s)"
_techo "Beginning to backup"
#
# Standard configuration checks
#
if [ ! -e "${backup}" ]; then
_exit_err "Source does not exist."
fi
#
# configuration _must_ be a directory
#
if [ ! -d "${backup}" ]; then
_exit_err "\"${name}\" is not a cconfig-directory. Skipping."
fi
# #
# Read possible options # Read possible options
# #