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

Some smaller configuration changes, some message clarifications

This commit is contained in:
Nico Schottelius 2006-01-13 13:33:26 +01:00
parent 36497a3f6a
commit 687e0b6a68
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ccollect.sh
View File

@ -256,7 +256,7 @@ while [ "$i" -lt "$no_shares" ]; do
# the created directories are named $INTERVALL.$DATE # the created directories are named $INTERVALL.$DATE
count=$(ls -d "$c_dest/${INTERVALL}."?* 2>/dev/null | wc -l) count=$(ls -d "$c_dest/${INTERVALL}."?* 2>/dev/null | wc -l)
stdecho "$count backup(s) already exist, keeping $c_intervall backup(s)." stdecho "Currently $count backup(s) exist, total keeping $c_intervall backup(s)."
if [ "$count" -ge "$c_intervall" ]; then if [ "$count" -ge "$c_intervall" ]; then
substract=$(echo $c_intervall - 1 | bc) substract=$(echo $c_intervall - 1 | bc)
@ -285,10 +285,11 @@ while [ "$i" -lt "$no_shares" ]; do
# only copy if a directory exists # only copy if a directory exists
if [ "$last_dir" ]; then if [ "$last_dir" ]; then
echo cp "$VERBOSE" -al "$last_dir" "$destination_dir" 2>&1 | add_name stdecho "Hard linking..."
cp -al $VERBOSE "$last_dir" "$destination_dir" 2>&1 | add_name
else else
stdecho "Creating $destination_di" stdecho "Creating $destination_dir"
echo mkdir "$destination_dir" 2>&1 | add_name mkdir "$destination_dir" 2>&1 | add_name
fi fi
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
@ -301,9 +302,10 @@ while [ "$i" -lt "$no_shares" ]; do
# options stolen shameless from rsnapshot # options stolen shameless from rsnapshot
# #
echo rsync -a "$VERBOSE" --delete --numeric-ids --relative --delete-excluded \ stdecho "Transferring files..."
"$EXCLUDE" "$RSYNC_EXTRA" "$source" "$destination_dir" 2>&1 $PARALLEL | \ rsync -a $VERBOSE $RSYNC_EXTRA $EXCLUDE \
add_name --delete --numeric-ids --relative --delete-excluded \
"$source" "$destination_dir" 2>&1 $PARALLEL | add_name
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
errecho "rsync failed, backup may be broken (see rsync errors)" errecho "rsync failed, backup may be broken (see rsync errors)"

2
conf/sources/testsource1/source
View File

@ -1 +1 @@
/home/nico/vpn /home/nico/tmp

0
conf/sources/testsource1/verbose
View File

2
conf/sources/vpn/source
View File

@ -1 +1 @@
/home/nico/vpn /home/nico/vpn/

2
doc/ccollect.text
View File

@ -1,7 +1,7 @@
ccollect - Installing, Configuring and Using ccollect - Installing, Configuring and Using
============================================ ============================================
Nico Schottelius <nico-linux-ccollect__@__schottelius.org> Nico Schottelius <nico-linux-ccollect__@__schottelius.org>
v0.1, 2005-01-11 v0.2, 2005-01-13
:Author Initials: NS :Author Initials: NS
(pseudo) incremental backup (pseudo) incremental backup