removed unnecessary parts for toxbank-investigation servicetb2.4.1

5 files changed, 4 insertions, 41 deletions

diff --git a/base-install b/base-install
index 3eaf9f4..c561588 100755
--- a/base-install
+++ b/base-install
@@ -29,26 +29,6 @@ if ! cat "/etc/apt/sources.list" | grep "$REDLAND_DEB">/dev/null 2>&1; then
   echo "deb-src $REDLAND_DEB ./" | sudo $TEE -a /etc/apt/sources.list >/dev/null
 fi
 
-cmd="$GPG --keyserver pgp.mit.edu --recv-key 381BA480  >/dev/null 2>&1; gpg -a --export 381BA480 > jranke_cran.asc" && run_cmd "$cmd" "Create CRAN apt-key"
-cmd="sudo $APT_KEY add jranke_cran.asc >/dev/null 2>&1; rm jranke_cran.asc" && run_cmd "$cmd" "Adding CRAN apt-key"
-if ! cat "/etc/apt/sources.list" | grep "$CRAN_DEB">/dev/null 2>&1; then
-  echo "deb $CRAN_DEB wheezy-cran3/" | sudo $TEE -a /etc/apt/sources.list >/dev/null
-fi
-
-
-
-#Only for ist nightly test server (3)
-case "`hostname`" in
-"istnightly3" )
-  FTP_DEB="http://ftp.de.debian.org/debian/"
-  if ! cat "/etc/apt/sources.list" | grep "$FTP_DEB">/dev/null 2>&1; then
-    echo "deb $FTP_DEB wheezy main" | sudo $TEE -a /etc/apt/sources.list >/dev/null
-    echo "deb-src $FTP_DEB wheezy main" | sudo $TEE -a /etc/apt/sources.list >/dev/null
-  fi
-  sudo sed -i "s;deb http://http.debian.net/debian wheezy-updates main;#deb http://http.debian.net/debian wheezy-updates main;" /etc/apt/sources.list
-  sudo sed -i "s;deb-src http://http.debian.net/debian wheezy-updates main;#deb-src http://http.debian.net/debian wheezy-updates main;" /etc/apt/sources.list;;
-*) ;;
-esac
 
 sudo $APTITUDE update -y >/dev/null 2>&1
 sudo $APTITUDE upgrade -y >/dev/null 2>&1
diff --git a/config.sh b/config.sh
index d573bc8..dff9e8b 100755
--- a/config.sh
+++ b/config.sh
@@ -11,18 +11,15 @@ OT_BRANCH="development"     # Maturity              (development -need SSH key a
 
 # 2) Where binaries are installed
 OT_PREFIX="$HOME/opentox-ruby"
-OT_JAVA_HOME="/usr/lib/jvm/java-6-openjdk" # use "/usr/lib/jvm/java-6-openjdk-amd64" for 64bit system architecture
+OT_JAVA_HOME="/usr/lib/jvm/java-7-openjdk" # use "/usr/lib/jvm/java-7-openjdk-amd64" for 64bit system architecture
 
 # 3) What versions to install
 
-OB_NUM_VER="2.3.2"
 RAPTOR2_NUM_VER="2.0.15"
 RASQAL_NUM_VER="0.9.33"
-REDIS_NUM_VER="2.4.4"
 RUBY_NUM_VER="2.0.0-p481"
 #RUBY_NUM_VER="2.1.2"
 FOUR_STORE_VER="4store-v1.1.5"
-REDIS_URL="http://redis.googlecode.com/files"
 REDLAND_DWL="http://download.librdf.org"
 REDLAND_APT_KEY="https://www.dajobe.org/gnupg.asc"
 FOUR_STORE_URL="http://4store.org/download"
@@ -38,8 +35,6 @@ BACKEND_NAME="opentox"
 ### Nothing to gain from changes below this line.
 JAVA_CONF="$HOME/.opentox/java.sh"
 FST_CONF="$HOME/.opentox/4S.sh"
-OB_CONF="$HOME/.opentox/OB.sh"
-R_CONF="$HOME/.opentox/R.sh"
 RAPTOR2_CONF="$HOME/.opentox/RAPTOR2.sh"
 RASQAL_CONF="$HOME/.opentox/RASQAL.sh"
 REDIS_CONF="$HOME/.opentox/REDIS.sh"
@@ -47,20 +42,10 @@ OT_UI_CONF="$HOME/.opentox/opentox-ui.sh"
 OT_TOOLS_CONF="$HOME/.opentox/ot-tools.sh"
 OT_DEFAULT_CONF="$HOME/.opentox/config/default.rb"
 
-OB_VER="openbabel-$OB_NUM_VER"
 RAPTOR2_VER="raptor2-$RAPTOR2_NUM_VER"
 RASQAL_VER="rasqal-$RASQAL_NUM_VER"
-REDIS_VER="redis-$REDIS_NUM_VER"
-OB_DEST="$OT_PREFIX/$OB_VER"
-OB_DEST_BINDINGS="$OT_PREFIX/openbabel-ruby-install"
-R_DEST="$OT_PREFIX/r-packages"
-R_MIRROR="http://cran.univ-paris1.fr"
-CRAN_DEB="$R_MIRROR/bin/linux/debian"
 RUBY_DWL="http://ftp.ruby-lang.org/pub/ruby/2.0"
 RAPTOR2_DWL="$REDLAND_DWL/source/$RAPTOR2_VER.tar.gz"
 RASQAL_DWL="$REDLAND_DWL/source/$RASQAL_VER.tar.gz"
-REDIS_DWL="$REDIS_URL/$REDIS_VER.tar.gz"
-REDIS_DIR="$OT_PREFIX/$REDIS_VER"
-REDIS_SERVER_CONF="$REDIS_DIR/redis.conf"
 REDLAND_DEB="$REDLAND_DWL/binaries/$OT_DIST/unstable"
 FOUR_STORE_DWL="$FOUR_STORE_URL/$FOUR_STORE_VER.tar.gz"
diff --git a/debian.list b/debian.list
index 029c266..f3fcb11 100644
--- a/debian.list
+++ b/debian.list
@@ -17,10 +17,8 @@ libssl-dev install
 libtool install
 libxml2-dev install
 libyaml-dev install
-libqtwebkit-dev install
-openjdk-6-jdk install
+openjdk-7-jdk install
 r-base-dev install
 r-base install
 uuid-dev install
 xsltproc install
-xvfb install
diff --git a/raptor2-install b/raptor2-install
index 4c7528d..c6f006e 100755
--- a/raptor2-install
+++ b/raptor2-install
@@ -10,7 +10,7 @@ check_utils "apt-get wget tar make grep"
 # Build
 mkdir -p $OT_PREFIX/tmp
 cd $OT_PREFIX/tmp/
-cmd="$WGET $RAPTOR2_DWL" && run_cmd "$cmd" "Download"
+cmd="$WGET $RAPTOR2_DWL -O $RAPTOR2_VER.tar.gz" && run_cmd "$cmd" "Download"
 export RAPTOR2_DIR=$OT_PREFIX/$SELF
 cmd="$TAR xvzf $RAPTOR2_VER.tar.gz" && run_cmd "$cmd" "Unpack" 
 rm $RAPTOR2_VER.tar.gz
diff --git a/rasqal-install b/rasqal-install
index 2934a2b..b53c18a 100755
--- a/rasqal-install
+++ b/rasqal-install
@@ -10,7 +10,7 @@ check_utils "apt-get wget tar make grep"
 # Build
 mkdir -p $OT_PREFIX/tmp
 cd $OT_PREFIX/tmp/
-cmd="$WGET $RASQAL_DWL" && run_cmd "$cmd" "Download"
+cmd="$WGET $RASQAL_DWL -O $RASQAL_VER.tar.gz" && run_cmd "$cmd" "Download"
 export RASQAL_DIR=$OT_PREFIX/$SELF
 cmd="$TAR xvzf $RASQAL_VER.tar.gz" && run_cmd "$cmd" "Unpack"
 rm $RASQAL_VER.tar.gz