1 files changed, 17 insertions, 15 deletions
diff --git a/opentox-webservices.sh b/opentox-webservices.sh
index fa589cd..ef98ded 100755
--- a/opentox-webservices.sh
+++ b/opentox-webservices.sh
@@ -31,6 +31,12 @@ if [ ! -e "$GIT" ]; then
   exit 1
 fi
 
+RUBY="`which ruby`"
+if [ ! -e "$RUBY" ]; then
+  echo "'ruby' missing. Install 'ruby' first. Aborting..."
+  exit 1
+fi
+
 LOG="/tmp/`basename $0`-log.txt"
 
 echo
@@ -55,35 +61,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 -
 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 -
 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"