X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=lib%2Fvserver.in;h=30b2dfb2c2efa5f27892844fc406fbcc8236d725;hb=66d619bf64dec4c7472b5d4c09a964f5027fadb4;hp=4c62291d4aca4b8ddd6f375aa0a9f28b28706695;hpb=d56c0f0aeedc84560821bd3c57239476e12615ca;p=matthijs%2Fupstream%2Fbackupninja.git diff --git a/lib/vserver.in b/lib/vserver.in index 4c62291..30b2dfb 100644 --- a/lib/vserver.in +++ b/lib/vserver.in @@ -1,3 +1,5 @@ +# -*- mode: sh; sh-basic-offset: 3; indent-tabs-mode: nil; -*- + ##################################################### ## VSERVERS RELATED FUNCTIONS FOR NINJAHELPER ## @@ -88,14 +90,18 @@ choose_one_vserver() { } ## -## If Vservers are not enabled, exit silently. +## If Vservers are not enabled, set host_or_vservers='host' and then return ## Else, have the user choose if he/she wants to perform the backup on the host ## system or on one Vserver. ## Set, respectively, $host_or_vservers to 'host' or 'vservers'. ## Returns 1 if cancelled. ## choose_host_or_one_vserver() { - [ "$vservers_are_available" == "yes" ] || return + if [ "$vservers_are_available" != "yes" ] + then + host_or_vservers='host' + return + fi local title=$1 # if there is one, set the previously chosen item as the default [ -n "$host_or_vservers" ] && setDefault $host_or_vservers @@ -114,7 +120,7 @@ choose_host_or_one_vserver() { } ## -## If Vservers are not enabled, exit silently. +## If Vservers are not enabled, set host_or_vservers='host' and then return ## Else, have the user choose the target he/she wants to perform the backup on: ## - host system only; ## - some vservers only; @@ -123,7 +129,11 @@ choose_host_or_one_vserver() { ## Returns 1 if cancelled. ## choose_host_or_vservers_or_both() { - [ "$vservers_are_available" == "yes" ] || return + if [ "$vservers_are_available" != "yes" ] + then + host_or_vservers='host' + return + fi local title=$1 # if there is one, set the previously chosen item as the default [ -n "$host_or_vservers" ] && setDefault $host_or_vservers