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

3 files changed, 4 insertions, 4 deletions

diff --git a/base-install.sh b/base-install.sh
index 4f554fc..fbf0689 100755
--- a/base-install.sh
+++ b/base-install.sh
@@ -27,7 +27,7 @@ fi
 touch $OT_UI_CONF
 
 # Pkgs
-packs="binutils build-essential git-core hostname libcurl4-openssl-dev libgsl0-dev libreadline5-dev libreadline-dev libssl-dev libxml2-dev libxslt1-dev lsb-release pwgen raptor-utils r-base r-base-core r-base-dev sun-java6-jdk wget zlib1g-dev"
+packs="binutils build-essential git-core gnuplot hostname libcurl4-openssl-dev libgsl0-dev libreadline5-dev libreadline-dev libsqlite3-dev libssl-dev libxml2-dev libxslt1-dev lsb-release pwgen raptor-utils r-base r-base-core r-base-dev sqlite3 sun-java6-jdk wget xsltproc zlib1g-dev"
 
 echo
 echo "Base Packages:"
diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 607cf18..d101600 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -8,7 +8,7 @@
 DIR="`pwd`"
 
 if [ "$(id -u)" = "0" ]; then
-  echo "This script must be run as non-root." 1>&2
+  echo "This script must be run as non-root." 1>&264
   exit 1
 fi
 
@@ -61,7 +61,7 @@ fi
 if [ "$OT_INSTALL" = "server" ]; then
   aa="https:\/\/opensso.in-silico.ch"
 else
-  aa=nil
+  aa=""
 fi
 
 mkdir -p "$HOME/.opentox/config" >>$LOG 2>&1
diff --git a/opentox-webservices.sh b/opentox-webservices.sh
index 7e904ad..23af311 100755
--- a/opentox-webservices.sh
+++ b/opentox-webservices.sh
@@ -42,7 +42,7 @@ echo "Webservices ('$LOG'):"
 
 mkdir -p "$WWW_DEST/opentox" >>$LOG 2>&1
 cd "$WWW_DEST/opentox" >>$LOG 2>&1
-for s in compound dataset algorithm model toxcreate task; do
+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
     cd "$s" >>$LOG 2>&1