diff options
author | Andreas Maunz <andreas@maunz.de> | 2011-11-23 09:49:21 +0100 |
---|---|---|
committer | Andreas Maunz <andreas@maunz.de> | 2011-11-23 09:49:21 +0100 |
commit | 7acb3bc7db272581b9055c8e073aa7b07206f6fe (patch) | |
tree | 6d4dab239682cd57244d0a47ea08e229e48f8e0e | |
parent | 515e9f780951a2868bd86af35f9bc2aaad6ab870 (diff) |
Minor improvements
-rwxr-xr-x | opentox-webservices.sh | 8 | ||||
-rwxr-xr-x | update | 16 |
2 files changed, 4 insertions, 20 deletions
diff --git a/opentox-webservices.sh b/opentox-webservices.sh index cc53d04..88f864c 100755 --- a/opentox-webservices.sh +++ b/opentox-webservices.sh @@ -65,21 +65,21 @@ cmd="$GIT submodule update" && run_cmd "$cmd" "Fminer Update" cd "libfminer/libbbrc">>$LOG 2>&1 $GIT checkout $OT_BRANCH>>$LOG 2>&1 $GIT pull >>$LOG 2>&1 -cd - +cd - >>$LOG 2>&1 cd "libfminer/liblast">>$LOG 2>&1 $GIT checkout $OT_BRANCH>>$LOG 2>&1 $GIT pull >>$LOG 2>&1 -cd - +cd - >>$LOG 2>&1 for mylib in bbrc last; do cmd="sed -i 's,^INCLUDE_OB.*,INCLUDE_OB\ =\ -I$OB_DEST/include/openbabel-2.0,g' $WWW_DEST/opentox/algorithm/libfminer/lib$mylib/Makefile; sed -i 's,^LDFLAGS_OB.*,LDFLAGS_OB\ =\ -L$OB_DEST/lib,g' $WWW_DEST/opentox/algorithm/libfminer/lib$mylib/Makefile" && run_cmd "$cmd" "Makefile $mylib (OB)" cmd="sed -i 's,^INCLUDE_RB.*,INCLUDE_RB\ =\ -I$RUBY_DEST/lib/ruby/1.8/`uname -m`-linux,g' $WWW_DEST/opentox/algorithm/libfminer/lib$mylib/Makefile" && run_cmd "$cmd" "Makefile $mylib (RB)" done cd "libfminer/libbbrc">>$LOG 2>&1 cmd="make ruby" && run_cmd "$cmd" "Make BBRC" -cd - +cd - >>$LOG 2>&1 cd "libfminer/liblast">>$LOG 2>&1 cmd="make ruby" && run_cmd "$cmd" "Make LAST" -cd - +cd - >>$LOG 2>&1 cd "last-utils">>$LOG 2>&1 $GIT checkout $OT_BRANCH>>$LOG 2>&1 $GIT pull >>$LOG 2>&1 @@ -1,16 +0,0 @@ -#!/bin/sh -. /etc/profile -gem update opentox-ruby -dir=`pwd` -cd /var/www/opentox -for s in *; do - echo $s - cd $s - git pull - cd - -done -cd /var/www/algorithm -rake fminer:update -kill `cat /opt/nginx/logs/nginx.pid` -/opt/nginx/sbin/nginx -cd $dir |