X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Frdiff;h=6cbe6faf48ba8cc3a9a2687ede8931185a30af93;hb=dc8e99c6c42a6f6bed025132aee37f4a742f6d0d;hp=4871d4e17d91102ea40c6f3e323eeb3d75ae6d86;hpb=cf0e2ac5d5efba9bbc2efc79901467fd94cf3f15;p=matthijs%2Fupstream%2Fbackupninja.git diff --git a/handlers/rdiff b/handlers/rdiff index 4871d4e..6cbe6fa 100644 --- a/handlers/rdiff +++ b/handlers/rdiff @@ -174,12 +174,14 @@ set -o noglob # TODO: order the includes and excludes # excludes for i in $exclude; do + i=`readlink -f $i` str="${i//__star__/*}" execstr="${execstr}--exclude '$str' " done # includes for i in $include; do [ "$i" != "/" ] || fatal "Sorry, you cannot use 'include = /'" + i=`readlink -f $i` str="${i//__star__/*}" execstr="${execstr}--include '$str' " done @@ -188,7 +190,8 @@ done if [ $usevserver = yes ]; then for vserver in $vsnames; do for vi in $vsinclude; do - str="${vi//__star__/*}" + i=`readlink -f $VROOTDIR/$vserver$vi` + str="${i//__star__/*}" execstr="${execstr}--include '$VROOTDIR/$vserver$str' " done done