Fixed checkout development as git@..., root check at beginning of install

2 files changed, 9 insertions, 4 deletions

diff --git a/install b/install
index ce76e87..daa7d57 100755
--- a/install
+++ b/install
@@ -2,6 +2,11 @@
 # Main Opentox-ruby install script
 # Author: Christoph Helma, Andreas Maunz
 
+if [ "$(id -u)" = "0" ]; then
+  echo "This script must not be run as root" 1>&2
+  exit 1
+fi
+
 LOG="/tmp/`basename $0`-log.txt"
 . "./utils.sh"
 echo
@@ -18,9 +23,9 @@ cmd="sudo echo -n \"\"" && run_cmd "$cmd" "Acquire privileges"
 
 if [ "$install" != "gem" ]
 then
-    . "./nginx.sh"
-    . "./redis.sh"
-    . "./opentox-webservices.sh"
+  . "./nginx.sh"
+  . "./redis.sh"
+  . "./opentox-webservices.sh"
 fi
 
 echo "Cleaning up temp files."
diff --git a/opentox-webservices.sh b/opentox-webservices.sh
index 23af311..91d402e 100755
--- a/opentox-webservices.sh
+++ b/opentox-webservices.sh
@@ -44,7 +44,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
-    $GIT clone "git://github.com/opentox/$s.git" "$s" >>$LOG 2>&1
+    $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