X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fdup;h=227ba8bcf11f1edc90b0dd71d696ef6ea46ee52d;hb=0137962360bd449b4699e06bc9fad6285492f3a9;hp=ac7e3295871cc97eb5b2ceb3cf9b95e5ed79553b;hpb=aff6fdf34988b472e0bc016e48dc792ea214918c;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/dup b/handlers/dup
index ac7e329..227ba8b 100644
--- a/handlers/dup
+++ b/handlers/dup
@@ -35,28 +35,20 @@ destdir=${destdir%/}
 
 ### vservers stuff ###
 
-# See if vservers are configured.
-# If so, check that the ones listed in $vsnames do exist.
-if [ "$vservers" == "yes" ]; then
-    [ -d "$VROOTDIR" ] || fatal "vservers enabled, but $VROOTDIR does not exist!"
-    if [ "$vsnames" == "all" ]; then
-	vsnames=""
-    	for vserver in `ls $VROOTDIR | grep -E -v "lost+found|ARCHIVES"`; do
-	    vsnames="$vserver $vsnames"
-	done
-    else
-	for vserver in $vsnames; do
-	    [ -d "$VROOTDIR/$vserver" ] || fatal "vserver '$vserver' does not exist."
-	done
-    fi
-    if [ -n "$vsnames" ]; then
-	if [ -n "$vsinclude" ]; then
-	    info "Using vservers '$vsnames'"
-	    usevserver=1
-	fi
-    else
-	[ -z "$vsinclude" ] || warning 'vsnames is empty, vsinclude configuration lines will be ignored'
-    fi
+# If vservers are configured, check that the ones listed in $vsnames do exist.
+local usevserver=no
+if [ $vservers_are_available = yes ]; then
+   if [ "$vsnames" = all ]; then
+      vsnames="$found_vservers"
+   else
+      if ! vservers_exist "$vsnames" ; then
+            fatal "At least one of the vservers listed in vsnames ($vsnames) does not exist."
+      fi
+   fi
+   if [ -n "$vsinclude" ]; then
+      info "Using vservers '$vsnames'"
+      usevserver=yes
+   fi
 else
    [ -z "$vsinclude" ] || warning 'vservers support disabled in backupninja.conf, vsincludes configuration lines will be ignored'
    [ -z "$vsnames" ] || warning 'vservers support disabled in backupninja.conf, vsnames configuration line will be ignored'   
@@ -122,28 +114,35 @@ execstr_clientpart="/"
 
 ### SOURCE ###
 
+set -o noglob
+
 # excludes
-for i in "$exclude"; do
+for i in $exclude; do
+	i=`readlink -f $i`
 	str="${i//__star__/*}"
 	execstr="${execstr}--exclude '$str' "
 done
 	
 # includes 
-for i in "$include"; do
+for i in $include; do
+	i=`readlink -f $i`
 	str="${i//__star__/*}"
 	execstr="${execstr}--include '$str' "
 done
 
 # vsincludes
-if [ $usevserver ]; then
+if [ $usevserver = yes ]; then
     for vserver in $vsnames; do
-	for vi in "$vsinclude"; do
-	    str="${vi//__star__/*}"
+	for vi in $vsinclude; do
+	    i=`readlink -f $VROOTDIR/$vserver$vi`
+	    str="${i//__star__/*}"
 	    execstr="${execstr}--include '$VROOTDIR/$vserver$str' "
 	done
     done
 fi
 
+set +o noglob
+
 ### EXECUTE ###
 
 # exclude everything else, start with root