diff options
| author | Andreas Maunz <andreas@maunz.de> | 2012-02-09 15:47:19 +0100 |
|---|---|---|
| committer | Andreas Maunz <andreas@maunz.de> | 2012-02-09 15:47:19 +0100 |
| commit | d6d9bab4f77dc4e65f8120f2602d38178721a80e (patch) | |
| tree | d1925cd14960d410353a567a1b331689abd4a428 /opentox-ruby.sh | |
| parent | 33babc8050bf00dba4929cb35d65bef926c9b7b4 (diff) | |
| parent | ca56463e893e0d058dc5571e673d2fbfe14508b2 (diff) | |
Merge branch 'pc_new_1' into development
Conflicts:
config.sh
Diffstat (limited to 'opentox-ruby.sh')
| -rwxr-xr-x | opentox-ruby.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/opentox-ruby.sh b/opentox-ruby.sh index 9705682..64ac93a 100755 --- a/opentox-ruby.sh +++ b/opentox-ruby.sh @@ -73,6 +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,;s,NGINX_PORT,$NGINX_PORT,;s,OHM_PORT,$OHM_PORT,\" 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,;s,NGINX_PORT,$NGINX_PORT,;s,OHM_PORT,$OHM_PORT,\" aa-$OT_INSTALL.yaml >> $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config 2" +cmd="cp ambit_descriptors.yaml $HOME/.opentox/config/" && run_cmd "$cmd" "Ambit" if [ "$OT_BRANCH" = "development" ] || expr match "$OT_BRANCH" "release"; then mkdir -p $WWW_DEST/opentox >>$LOG 2>&1 |