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

now put the dot back into CMARKER

Browse source 
Removed it some hundred commits before

Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
This commit is contained in:
Nico Schottelius 2009-10-25 20:15:14 +01:00
parent ce6157efee
commit 84c732bfc0
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ccollect.sh
View file

@ -38,7 +38,7 @@ CSOURCES="${CCOLLECT_CONF}/sources"
CDEFAULTS="${CCOLLECT_CONF}/defaults" CDEFAULTS="${CCOLLECT_CONF}/defaults"
CPREEXEC="${CDEFAULTS}/pre_exec" CPREEXEC="${CDEFAULTS}/pre_exec"
CPOSTEXEC="${CDEFAULTS}/post_exec" CPOSTEXEC="${CDEFAULTS}/post_exec"
CMARKER="ccollect-marker" CMARKER=".ccollect-marker"
export TMP=$(mktemp "/tmp/${__myname}.XXXXXX") export TMP=$(mktemp "/tmp/${__myname}.XXXXXX")
VERSION="0.8" VERSION="0.8"
@ -427,9 +427,9 @@ while [ "${i}" -lt "${no_sources}" ]; do
# #
incomplete="$(echo \ incomplete="$(echo \
$(pcmd ls -1 "${ddir}/" | \ $(pcmd ls -1 "${ddir}/" | \
awk '/\.ENVIRON["CMARKER"]$/ { awk '/ENVIRON["CMARKER"]$/ {
print $0; print $0;
gsub("\." ENVIRON["CMARKER"]$","",$0); gsub(ENVIRON["CMARKER"]$,"",$0);
print $0 print $0
}' | \ }' | \
tee "${TMP}"))" tee "${TMP}"))"
@ -504,7 +504,7 @@ while [ "${i}" -lt "${no_sources}" ]; do
# #
# added marking in 0.6 (and remove it, if successful later) # added marking in 0.6 (and remove it, if successful later)
# #
pcmd touch "${destination_dir}.${CMARKER}" pcmd touch "${destination_dir}${CMARKER}"
# #
# the rsync part # the rsync part
@ -534,8 +534,8 @@ while [ "${i}" -lt "${no_sources}" ]; do
# Remove marking here unless rsync failed. # Remove marking here unless rsync failed.
# #
if [ -z "$fail" ]; then if [ -z "$fail" ]; then
pcmd rm "${destination_dir}.${CMARKER}" || \ pcmd rm "${destination_dir}${CMARKER}" || \
_exit_err "Removing ${destination_dir}.${CMARKER} failed." _exit_err "Removing ${destination_dir}${CMARKER} failed."
if [ "${ret}" -ne 0 ]; then if [ "${ret}" -ne 0 ]; then
_techo "Warning: rsync exited non-zero, the backup may be broken (see rsync errors)." _techo "Warning: rsync exited non-zero, the backup may be broken (see rsync errors)."
fi fi