diff options
| author | Andreas Maunz <andreas@maunz.de> | 2011-05-18 09:29:29 +0200 |
|---|---|---|
| committer | Andreas Maunz <andreas@maunz.de> | 2011-05-18 09:29:29 +0200 |
| commit | 6ea88d31eeae8017d13b495f97794243838a2e42 (patch) | |
| tree | a65f1c14b32e36be889f5724be82bfb9c103d684 /opentox-ruby.sh | |
| parent | 7d7ed42d8700c4980c767d2904cd6696cd80a3b2 (diff) | |
| parent | 2a9154ab9115f86d5824e5424d164c98624a6545 (diff) | |
Merge branch 'development' of github.com:opentox/install into development
Diffstat (limited to 'opentox-ruby.sh')
| -rw-r--r--[-rwxr-xr-x] | opentox-ruby.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/opentox-ruby.sh b/opentox-ruby.sh index adccf4d..5f8cc65 100755..100644 --- a/opentox-ruby.sh +++ b/opentox-ruby.sh @@ -73,7 +73,7 @@ $GIT checkout aa-$OT_INSTALL.yaml >>$LOG 2>&1 cmd="sed -e \"s,SERVERNAME,$servername,;s,ESCAPEDSERVER,$escapedserver,;s,LOGGER,$logger,;s,AA,$aa,;s,WWW_DEST,$WWW_DEST,\" 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,;s,WWW_DEST,$WWW_DEST,\" aa-$OT_INSTALL.yaml >> $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config 1" -if [ "$OT_BRANCH" = "development" ]; then +if [ "$OT_BRANCH" = "development" ] || expr match "$OT_BRANCH" "release"; then mkdir -p $WWW_DEST/opentox >>$LOG 2>&1 cd $WWW_DEST/opentox >>$LOG 2>&1 rm -rf opentox-ruby >>$LOG 2>&1 |