1 files changed, 6 insertions, 10 deletions
diff --git a/opentox-webservices.sh b/opentox-webservices.sh
index ef98ded..88f864c 100755
--- a/opentox-webservices.sh
+++ b/opentox-webservices.sh
@@ -37,7 +37,7 @@ if [ ! -e "$RUBY" ]; then
   exit 1
 fi
 
-LOG="/tmp/`basename $0`-log.txt"
+LOG="$HOME/tmp/`basename $0`-log.txt"
 
 echo
 echo "Webservices ('$LOG'):"
@@ -46,11 +46,7 @@ mkdir -p "$WWW_DEST/opentox" >>$LOG 2>&1
 cd "$WWW_DEST/opentox" >>$LOG 2>&1
 for s in compound dataset algorithm model toxcreate task validation; do
     rm -rf "$s" >>$LOG 2>&1
-    if [ "$OT_BRANCH" = "development" ] || expr match "$OT_BRANCH" "release"; then
-      $GIT clone "git@github.com:opentox/$s.git" "$s" >>$LOG 2>&1
-    else
-      $GIT clone "git://github.com/opentox/$s.git" "$s" >>$LOG 2>&1
-    fi
+    $GIT clone "git://github.com/opentox/$s.git" "$s" >>$LOG 2>&1
     cd "$s" >>$LOG 2>&1
     $GIT checkout -b $OT_BRANCH origin/$OT_BRANCH >>$LOG 2>&1
     #rm -rf public >>$LOG 2>&1
@@ -69,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