jfut/ccollect
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Modifies ccollect.sh's interpretation of options:

Browse source 
1).  If an option doesn't exist in a source directory, check the defaults directory.
2).  For every option, create a corresponding "no_" option so that a source directory
     can override an option set in defaults.
(i.patch)
This commit is contained in:
jll2 2009-06-14 17:54:48 -07:00 committed by Nico Schottelius
parent b121e545f7
commit 122982b0b9
1 changed files with 11 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
ccollect.sh
View file

@ -283,16 +283,15 @@ while [ "${i}" -lt "${no_sources}" ]; do
backup="${CSOURCES}/${name}" backup="${CSOURCES}/${name}"
c_source="${backup}/source" c_source="${backup}/source"
c_dest="${backup}/destination" c_dest="${backup}/destination"
c_exclude="${backup}/exclude"
c_verbose="${backup}/verbose"
c_vverbose="${backup}/very_verbose"
c_rsync_extra="${backup}/rsync_options"
c_summary="${backup}/summary"
c_pre_exec="${backup}/pre_exec" c_pre_exec="${backup}/pre_exec"
c_post_exec="${backup}/post_exec" c_post_exec="${backup}/post_exec"
f_incomplete="delete_incomplete" for opt in exclude verbose very_verbose rsync_options summary delete_incomplete remote_host ; do
c_incomplete="${backup}/${f_incomplete}" if [ -f "${backup}/$opt" -o -f "${backup}/no_$opt" ]; then
c_remote_host="${backup}/remote_host" 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
@ -307,12 +306,8 @@ while [ "${i}" -lt "${no_sources}" ]; do
# #
# unset possible options # unset possible options
# #
EXCLUDE=""
RSYNC_EXTRA=""
SUMMARY=""
VERBOSE="" VERBOSE=""
VVERBOSE="" VVERBOSE=""
DELETE_INCOMPLETE=""
_techo "Beginning to backup" _techo "Beginning to backup"
@ -408,13 +403,6 @@ while [ "${i}" -lt "${no_sources}" ]; do
( pcmd cd "$ddir" ) || _exit_err "Cannot change to ${ddir}. Skipping." ( pcmd cd "$ddir" ) || _exit_err "Cannot change to ${ddir}. Skipping."
#
# Check whether to delete incomplete backups
#
if [ -f "${c_incomplete}" -o -f "${CDEFAULTS}/${f_incomplete}" ]; then
DELETE_INCOMPLETE="yes"
fi
# NEW method as of 0.6: # NEW method as of 0.6:
# - insert ccollect default parameters # - insert ccollect default parameters
# - insert options # - insert options
@ -444,7 +432,7 @@ while [ "${i}" -lt "${no_sources}" ]; do
# #
# Verbosity for rsync # Verbosity for rsync
# #
if [ -f "${c_vverbose}" ]; then if [ -f "${c_very_verbose}" ]; then
set -- "$@" "-vv" set -- "$@" "-vv"
elif [ -f "${c_verbose}" ]; then elif [ -f "${c_verbose}" ]; then
set -- "$@" "-v" set -- "$@" "-v"
@ -453,10 +441,10 @@ while [ "${i}" -lt "${no_sources}" ]; do
# #
# extra options for rsync provided by the user # extra options for rsync provided by the user
# #
if [ -f "${c_rsync_extra}" ]; then if [ -f "${c_rsync_options}" ]; then
while read line; do while read line; do
set -- "$@" "$line" set -- "$@" "$line"
done < "${c_rsync_extra}" done < "${c_rsync_options}"
fi fi
# #
@ -474,7 +462,7 @@ while [ "${i}" -lt "${no_sources}" ]; do
while [ "$j" -lt "$i" ]; do while [ "$j" -lt "$i" ]; do
eval realincomplete=\"\$incomplete_$j\" eval realincomplete=\"\$incomplete_$j\"
_techo "Incomplete backup: ${realincomplete}" _techo "Incomplete backup: ${realincomplete}"
if [ "${DELETE_INCOMPLETE}" = "yes" ]; then if [ -f "${c_delete_incomplete}" ]; then
_techo "Deleting ${realincomplete} ..." _techo "Deleting ${realincomplete} ..."
pcmd rm $VVERBOSE -rf "${ddir}/${realincomplete}" || \ pcmd rm $VVERBOSE -rf "${ddir}/${realincomplete}" || \
_exit_err "Removing ${realincomplete} failed." _exit_err "Removing ${realincomplete} failed."