From 2060baa71a20d3238db0610b51e6175db2e3c4dd Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sun, 15 Oct 2006 14:16:20 +0200 Subject: [PATCH] Preperations for a version without pax --- TODO | 2 ++ ccollect.sh | 8 +++++--- conf/sources/testsource1/source | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/TODO b/TODO index 26feb99..0f6292e 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,5 @@ +12:25 [lugs] -!- papo [~mathias@192.168.14.164] +12:25 [lugs] -!- ircname : Mathias Weyland 11:39 <~papo> was is der Unterschied zu rsync -a --delete --link-dest=$snapshot/$lastdate /home/ $snapshot/$curdate -------------------------------------------------------------------------------- diff --git a/ccollect.sh b/ccollect.sh index e94cb82..9480246 100755 --- a/ccollect.sh +++ b/ccollect.sh @@ -14,7 +14,7 @@ CPREEXEC="$CDEFAULTS/pre_exec" CPOSTEXEC="$CDEFAULTS/post_exec" TMP=$(mktemp /tmp/$(basename $0).XXXXXX) -VERSION=0.4.3 +VERSION=0.5 RELEASE="2006-XX-XX" HALF_VERSION="ccollect $VERSION" FULL_VERSION="ccollect $VERSION ($RELEASE)" @@ -386,8 +386,9 @@ while [ "$i" -lt "$no_sources" ]; do # only copy if a directory exists if [ "$last_dir" ]; then echo "$($DDATE) Hard linking..." - cd "$last_dir" - pax -rwl -p e $VVERBOSE . "$abs_destination_dir" + #cd "$last_dir" + #pax -rwl -p e $VVERBOSE . "$abs_destination_dir" + rsync_hardlink="--link-dest=\"$last_dir\"" fi if [ $? -ne 0 ]; then @@ -404,6 +405,7 @@ while [ "$i" -lt "$no_sources" ]; do echo "$($DDATE) Transferring files..." rsync -a --delete --numeric-ids --relative --delete-excluded \ + $rsync_hardlink \ $VERBOSE $EXCLUDE $SUMMARY $RSYNC_EXTRA \ "$source" "$abs_destination_dir" diff --git a/conf/sources/testsource1/source b/conf/sources/testsource1/source index f8ea6e1..46b885f 100644 --- a/conf/sources/testsource1/source +++ b/conf/sources/testsource1/source @@ -1 +1 @@ -/home/nico/bilder +/home/user/nico/test2