opentox-webservices

1 files changed, 39 insertions, 23 deletions

diff --git a/opentox-webservices.sh b/opentox-webservices.sh
index 294b9bf..8fe8a1f 100755
--- a/opentox-webservices.sh
+++ b/opentox-webservices.sh
@@ -1,23 +1,37 @@
-#!/bin/sh
-
-echo "Installing OpenTox webservices"
-. ./config
-# Create opentox system user
-id opentox
-if [ $? -ne 0 ] 
-then
-   adduser --system opentox
+#!/bin/bash
+#
+# Installs Opentox Webservices.
+# Author: Christoph Helma, Andreas Maunz.
+#
+
+if [ "$(id -u)" = "0" ]; then
+  echo "This script must be run as non-root." 1>&2
+  exit 1
+fi
+
+# Utils
+WGET="`which wget`"
+if [ ! -e "$WGET" ]; then
+  echo "'wget' missing. Install 'wget' first. Aborting..."
+  exit 1
 fi
 
-dir=`pwd`
-mkdir -p /var/www/opentox
-cd /var/www/opentox
+source ./config.sh
+
+echo "This installs Opentox webservices."
+echo "Press <Return> to continue, or <Ctrl+C> to abort."
+read
+
+DIR=`pwd`
+
+mkdir -p "$WWW_DEST/opentox"
+cd "$WWW_DEST/opentox"
 for s in compound dataset algorithm model toxcreate task; do
-    git clone git://github.com/opentox/$s.git $s
-    cd $s
-    git checkout -t origin/$branch
-    mkdir -p public
-    ln -s /var/www/opentox/$s/public /var/www/$s
+    git clone "git://github.com/opentox/$s.git" "$s"
+    cd "$s"
+    git checkout -t origin/development # AM: use development
+    mkdir public
+    ln -s "$WWW_DEST/opentox/$s/public" "$WWW_DEST/$s"
     cd -
 done
 
@@ -30,10 +44,12 @@ done
 #ln -s /var/www/opentox/validation/public /var/www/validation
 
 # fminer etc
-cd /var/www/opentox/algorithm
-updatedb
+cd $WWW_DEST/opentox/algorithm
+echo "Need root password:"
+sudo updatedb
 rake fminer:install
-chown -R opentox /var/www/opentox
-cp -r $HOME/.opentox /home/opentox/
-chown -R opentox /home/opentox/.opentox
-cd $dir
+cp -r "$HOME/.opentox" "$HOME"
+
+cd "$DIR"
+echo
+echo "Opentox installation finished."