diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-21 16:40:22 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-21 16:40:22 +0100 |
| commit | a0be4eb42a1d0fc93e592bff9c27cc3e74968bec (patch) | |
| tree | 20aa197bc2b549e23464d9d28b7b5eaa33b35ac5 /src/core | |
| parent | cbaff5ee1a800a1d4991faa94918f668cfb12bec (diff) | |
needle/haystack order + return code fixes
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/procedures/automatic | 6 |
1 files changed, 4 insertions, 2 deletions
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 } |