diff options
| author | Andreas Maunz <andreas@maunz.de> | 2011-04-01 16:35:18 +0200 |
|---|---|---|
| committer | Andreas Maunz <andreas@maunz.de> | 2011-04-01 16:35:18 +0200 |
| commit | ed920f0ae3676d7fee9b3471cdb483ba222a16a1 (patch) | |
| tree | d34de1277e9d43454ceadcdd363b962dd43336d1 /opentox-ruby.sh | |
| parent | 6e15685c0992a720507209c2c9b43a9c561ade5e (diff) | |
Re-enabled variable branching
Diffstat (limited to 'opentox-ruby.sh')
| -rwxr-xr-x | opentox-ruby.sh | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/opentox-ruby.sh b/opentox-ruby.sh index f7a470d..b27ef85 100755 --- a/opentox-ruby.sh +++ b/opentox-ruby.sh @@ -51,8 +51,18 @@ if [ -n "$serverdomain" ]; then servername="$servername"."$serverdomain" fi escapedserver="`echo $servername | sed 's/\/\\\//'`" -logger=":logger: backtrace" -aa="nil" + +if [ "$OT_BRANCH" = "development" ]; then + logger=":logger: backtrace" +else + logger="" +fi + +if [ "$OT_INSTALL" = "server" ]; then + aa="https:\/\/opensso.in-silico.ch" +else + aa=nil +fi mkdir -p "$HOME/.opentox/config" >>$LOG 2>&1 mkdir -p "$HOME/.opentox/log" >>$LOG 2>&1 @@ -60,7 +70,7 @@ mkdir -p "$HOME/.opentox/log" >>$LOG 2>&1 cmd="sed -e \"s/SERVERNAME/$servername/;s/ESCAPEDSERVER/$escapedserver/;s/LOGGER/$logger/;s/AA/$aa/\" production.yaml > $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config 1" cmd="sed -e \"s/SERVERNAME/$servername/;s/ESCAPEDSERVER/$escapedserver/;s/LOGGER/$logger/;s/AA/$aa/\" aa-local.yaml >> $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config 2" -if [ $OT_BRANCH = "development" ]; then +if [ "$OT_BRANCH" = "development" ]; then mkdir -p $WWW_DEST/opentox >>$LOG 2>&1 cd $WWW_DEST/opentox >>$LOG 2>&1 rm -rf opentox-ruby >>$LOG 2>&1 |