optimized for 4store only on Debian wheezy

3 files changed, 40 insertions, 39 deletions

diff --git a/config.sh b/config.sh
index a329ac5..e5072e9 100755
--- a/config.sh
+++ b/config.sh
@@ -11,50 +11,50 @@ 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-6-openjdk" # use "/usr/lib/jvm/java-6-openjdk-amd64" for 64bit system architecture
 
 # 3) What versions to install
 
-OB_NUM_VER="2.3.1"
+#OB_NUM_VER="2.3.1"
 RAPTOR2_NUM_VER="2.0.8"
 RASQAL_NUM_VER="0.9.29"
-REDIS_NUM_VER="2.4.4"
-RUBY_NUM_VER="2.0.0-p247"
+#REDIS_NUM_VER="2.4.4"
+#RUBY_NUM_VER="2.0.0-p247"
 FOUR_STORE_VER="4store-v1.1.5"
-REDIS_URL="http://redis.googlecode.com/files"
+#REDIS_URL="http://redis.googlecode.com/files"
 REDLAND_DWL="http://download.librdf.org"
 REDLAND_APT_KEY="http://purl.org/net/dajobe/gnupg.asc"
 FOUR_STORE_URL="http://4store.org/download"
 
 # 4) Server settings.
-OHM_PORT="6379" # set to port (no colon)
+#OHM_PORT="6379" # set to port (no colon)
 
 # Done.
 
 ### Nothing to gain from changes below this line.
-JAVA_CONF="$HOME/.opentox/java.sh"
+#JAVA_CONF="$HOME/.opentox/java.sh"
 FST_CONF="$HOME/.opentox/4S.sh"
-OB_CONF="$HOME/.opentox/OB.sh"
-R_CONF="$HOME/.opentox/R.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"
+#REDIS_CONF="$HOME/.opentox/REDIS.sh"
 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"
+#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"
-RUBY_DWL="http://ftp.ruby-lang.org/pub/ruby/2.0"
+#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"
+#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"
+#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 a9443a7..c5e4e78 100644
--- a/debian.list
+++ b/debian.list
@@ -4,25 +4,26 @@ avahi-daemon install
 build-essential install
 cmake install
 curl install
-gnuplot install
+#gnuplot install
 libavahi-glib-dev install
 libavahi-client-dev install
 libcairo2-dev install
 libglib2.0-dev install
-libgsl0-dev install
-libopenssl-ruby install
+#libgsl0-dev install
+#libopenssl-ruby install
 libpcre3-dev install
 libraptor1-dev install
 libreadline-dev install
 libssl-dev install
 libtool install
 libxml2-dev install
-libyaml-dev install
-libqtwebkit-dev install
-ncurses-dev install
-openjdk-6-jdk install
-r-base-dev install
-r-base install
+#libyaml-dev install
+#libqtwebkit-dev install
+#ncurses-dev install
+libncurses5-dev install
+#openjdk-6-jdk install
+#r-base-dev install
+#r-base install
 uuid-dev install
-xsltproc install
-xvfb install
+#xsltproc install
+#xvfb install
diff --git a/install b/install
index cecf61d..d4aa117 100755
--- a/install
+++ b/install
@@ -61,21 +61,21 @@ echo
 ./4store-install # Download, compile and build 4store. Install to OT_PREFIX.
 
 check_utils "git"
-if [ ! -d ~/.rbenv ]; then
-  cmd="$GIT clone git://github.com/sstephenson/rbenv.git ~/.rbenv" && run_cmd "$cmd" "rbenv"
-else
-  echo "NOTE: 'rbenv' already installed. Leaving untouched."
-fi
+#if [ ! -d ~/.rbenv ]; then
+#  cmd="$GIT clone git://github.com/sstephenson/rbenv.git ~/.rbenv" && run_cmd "$cmd" "rbenv"
+#else
+#  echo "NOTE: 'rbenv' already installed. Leaving untouched."
+#fi
 
-if ! grep "rbenv" $OT_UI_CONF >/dev/null 2>&1 ; then
-  echo 'if ! echo "$PATH" | grep "$HOME/.rbenv/bin">/dev/null 2>&1; then export PATH="$HOME/.rbenv/bin:$PATH"; eval "$(rbenv init -)"; fi' >> $OT_UI_CONF
-fi
+#if ! grep "rbenv" $OT_UI_CONF >/dev/null 2>&1 ; then
+#  echo 'if ! echo "$PATH" | grep "$HOME/.rbenv/bin">/dev/null 2>&1; then export PATH="$HOME/.rbenv/bin:$PATH"; eval "$(rbenv init -)"; fi' >> $OT_UI_CONF
+#fi
 
 [ -f $OT_TOOLS_CONF ] || (cmd="cp ot-tools-user.sh $OT_TOOLS_CONF" && run_cmd "$cmd" "ot-tools.sh => $HOME/.opentox")
 
 # Install global ruby version
 . ./utils.sh
-install_ruby global
+#install_ruby global
 
 if [ $SILENT = false ]; then
   notify