From 687e0b6a68b752af09ee15b7d69577eb8959bf9d Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 13 Jan 2006 13:33:26 +0100 Subject: [PATCH] Some smaller configuration changes, some message clarifications --- ccollect.sh | 16 +++++++++------- conf/sources/testsource1/source | 2 +- conf/sources/testsource1/verbose | 0 conf/sources/vpn/source | 2 +- doc/ccollect.text | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) delete mode 100644 conf/sources/testsource1/verbose diff --git a/ccollect.sh b/ccollect.sh index 9b36ecd..c8e7525 100755 --- a/ccollect.sh +++ b/ccollect.sh @@ -256,7 +256,7 @@ while [ "$i" -lt "$no_shares" ]; do # the created directories are named $INTERVALL.$DATE 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 substract=$(echo $c_intervall - 1 | bc) @@ -285,10 +285,11 @@ while [ "$i" -lt "$no_shares" ]; do # only copy if a directory exists 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 - stdecho "Creating $destination_di" - echo mkdir "$destination_dir" 2>&1 | add_name + stdecho "Creating $destination_dir" + mkdir "$destination_dir" 2>&1 | add_name fi if [ $? -ne 0 ]; then @@ -301,9 +302,10 @@ while [ "$i" -lt "$no_shares" ]; do # options stolen shameless from rsnapshot # - echo rsync -a "$VERBOSE" --delete --numeric-ids --relative --delete-excluded \ - "$EXCLUDE" "$RSYNC_EXTRA" "$source" "$destination_dir" 2>&1 $PARALLEL | \ - add_name + stdecho "Transferring files..." + rsync -a $VERBOSE $RSYNC_EXTRA $EXCLUDE \ + --delete --numeric-ids --relative --delete-excluded \ + "$source" "$destination_dir" 2>&1 $PARALLEL | add_name if [ $? -ne 0 ]; then errecho "rsync failed, backup may be broken (see rsync errors)" diff --git a/conf/sources/testsource1/source b/conf/sources/testsource1/source index 597ddca..7e6dd53 100644 --- a/conf/sources/testsource1/source +++ b/conf/sources/testsource1/source @@ -1 +1 @@ -/home/nico/vpn +/home/nico/tmp diff --git a/conf/sources/testsource1/verbose b/conf/sources/testsource1/verbose deleted file mode 100644 index e69de29..0000000 diff --git a/conf/sources/vpn/source b/conf/sources/vpn/source index 597ddca..04b9f19 100644 --- a/conf/sources/vpn/source +++ b/conf/sources/vpn/source @@ -1 +1 @@ -/home/nico/vpn +/home/nico/vpn/ diff --git a/doc/ccollect.text b/doc/ccollect.text index 31cd9af..f164d1f 100644 --- a/doc/ccollect.text +++ b/doc/ccollect.text @@ -1,7 +1,7 @@ ccollect - Installing, Configuring and Using ============================================ Nico Schottelius -v0.1, 2005-01-11 +v0.2, 2005-01-13 :Author Initials: NS (pseudo) incremental backup