X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fdup;h=ac7e3295871cc97eb5b2ceb3cf9b95e5ed79553b;hb=aff6fdf34988b472e0bc016e48dc792ea214918c;hp=b6c2bfd2991f77b8ee39471981bbae176c695b42;hpb=0d606253af6ecb8ede07b0991a1f295fb70e7e65;p=matthijs%2Fupstream%2Fbackupninja.git diff --git a/handlers/dup b/handlers/dup index b6c2bfd..ac7e329 100644 --- a/handlers/dup +++ b/handlers/dup @@ -45,7 +45,7 @@ if [ "$vservers" == "yes" ]; then vsnames="$vserver $vsnames" done else - for vserver in "$vsnames"; do + for vserver in $vsnames; do [ -d "$VROOTDIR/$vserver" ] || fatal "vserver '$vserver' does not exist." done fi @@ -57,6 +57,9 @@ if [ "$vservers" == "yes" ]; then else [ -z "$vsinclude" ] || warning 'vsnames is empty, vsinclude configuration lines will be ignored' 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' fi ### see if we can login ### @@ -120,13 +123,13 @@ execstr_clientpart="/" ### SOURCE ### # excludes -for i in $exclude; do +for i in "$exclude"; do str="${i//__star__/*}" execstr="${execstr}--exclude '$str' " done # includes -for i in $include; do +for i in "$include"; do str="${i//__star__/*}" execstr="${execstr}--include '$str' " done @@ -134,7 +137,7 @@ done # vsincludes if [ $usevserver ]; then for vserver in $vsnames; do - for vi in $vsinclude; do + for vi in "$vsinclude"; do str="${vi//__star__/*}" execstr="${execstr}--include '$VROOTDIR/$vserver$str' " done