X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fdup;h=5970694b03f9b6d5ce3999287bca83daf7e3c948;hb=4beb261328e6e09d9f23c2f3a7a45e2ed94d30bc;hp=bbdb0aeff2dc4bddaa75f538e438603c7807dbc2;hpb=c6c3cc98b476fdd575ef52b9e1b63c380828e8f3;p=matthijs%2Fupstream%2Fbackupninja.git diff --git a/handlers/dup b/handlers/dup index bbdb0ae..5970694 100644 --- a/handlers/dup +++ b/handlers/dup @@ -1,3 +1,4 @@ +# -*- mode: sh; sh-basic-offset: 3; indent-tabs-mode: nil; -*- # # duplicity script for backupninja # requires duplicity @@ -56,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 ### @@ -119,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 @@ -133,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