From a0be4eb42a1d0fc93e592bff9c27cc3e74968bec Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Sun, 21 Dec 2008 16:40:22 +0100 Subject: needle/haystack order + return code fixes --- src/core/procedures/automatic | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/core') diff --git a/src/core/procedures/automatic b/src/core/procedures/automatic index bb78437..4369a5a 100644 --- a/src/core/procedures/automatic +++ b/src/core/procedures/automatic @@ -71,19 +71,21 @@ worker_runtime_network () # Check if we have all needed settings loaded from the profile worker_runtime_settings () { - if check_is_in svn "$var_RUNTIME_PACKAGES" + if check_is_in "$var_RUNTIME_PACKAGES" svn then [ -z "$SVN_USERNAME" ] && ask_string "Please enter your svn username" && SVN_USERNAME=$ANSWER_STRING [ -z "$SVN_PASSWORD" ] && ask_password svn #TODO: if user entered incorrect password, the install process will just fail.. [ -z "$SVN_BASE" ] && ask_string "What's the base path of your svn repo? (no ending /) " && SVN_BASE=$ANSWER_STRING [ -z "$DEPLOY_CLASS" ] && ask_string "Which hostclass are you installing? (optional)" '' 0 && DEPLOY_CLASS=$ANSWER_STRING SVN="svn --username $SVN_USERNAME --password $SVN_PASSWORD" - elif check_is_in moo "$var_RUNTIME_PACKAGES" + elif check_is_in "$var_RUNTIME_PACKAGES" moo then # Maybe more stuff later true fi [ -z "$HOSTNAME" ] && ask_string "Hostname of target system?" && HOSTNAME=$ANSWER_STRING + + return 0 } -- cgit v1.2.3-54-g00ecf