Merge branch 'development' of git://github.com/opentox/install into development

2 files changed, 21 insertions, 15 deletions

diff --git a/README b/README
index 25aa733..781a37c 100644
--- a/README
+++ b/README
@@ -37,14 +37,24 @@ otupdate() {
   cd $HOME/opentox-ruby/www/opentox
   for d in `find -not -name "." -type d -maxdepth 1 2>/dev/null`; do echo $d ; cd $d ; git pull  ; echo ; cd - ;  done
   cd  $HOME/opentox-ruby/www/opentox/algorithm/libfminer
-  git pull
+  mv libbbrc/Makefile libbbrc/Makefile~
+  mv liblast/Makefile liblast/Makefile~
+  if ! git pull; then
+    echo "Error! Pull for Fminer failed."
+    exit 1
+  fi
+  mv libbbrc/Makefile~ libbbrc/Makefile
+  mv liblast/Makefile~ liblast/Makefile
   make -C libbbrc/ clean
   make -C libbbrc/ ruby
   make -C liblast/ clean
   make -C liblast/ ruby
   cd -
   cd $HOME/opentox-ruby/www/opentox/algorithm/last-utils
-  git pull
+  if ! git pull; then
+    echo "Error! Pull for Last-Utils failed."
+    exit 1
+  fi
   cd -
   cd opentox-ruby
   rake install
diff --git a/opentox-webservices.sh b/opentox-webservices.sh
index fa589cd..811d4bc 100755
--- a/opentox-webservices.sh
+++ b/opentox-webservices.sh
@@ -55,35 +55,31 @@ for s in compound dataset algorithm model toxcreate task validation; do
     cd - >>$LOG 2>&1
 done
 
-# validation service
-#git clone http://github.com/mguetlein/opentox-validation.git validation
-#cd /var/www/opentox/validation
-#git checkout -t origin/test
-#gem install ruby-plot
-#mkdir -p public
-#ln -s /var/www/opentox/validation/public /var/www/validation
-
 # fminer etc
 cmd="test -f $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config present"
 cd "$WWW_DEST/opentox/algorithm" >>$LOG 2>&1
 cmd="$GIT submodule init" && run_cmd "$cmd" "Fminer Init"
 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 "libfminer/liblast">>$LOG 2>&1
+$GIT checkout $OT_BRANCH>>$LOG 2>&1
+$GIT pull >>$LOG 2>&1
+cd -
 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
-$GIT checkout master >>$LOG 2>&1
-$GIT pull >>$LOG 2>&1
 cmd="make ruby" && run_cmd "$cmd" "Make BBRC"
 cd ->>$LOG 2>&1
 cd "libfminer/liblast">>$LOG 2>&1
-$GIT checkout master >>$LOG 2>&1
-$GIT pull >>$LOG 2>&1
 cmd="make ruby" && run_cmd "$cmd" "Make LAST"
 cd ->>$LOG 2>&1
 cd "last-utils">>$LOG 2>&1
-$GIT checkout master >>$LOG 2>&1
+$GIT checkout $OT_BRANCH>>$LOG 2>&1
 $GIT pull >>$LOG 2>&1
 
 cd "$DIR"