Reduce packages.

5 files changed, 30 insertions, 26 deletions

diff --git a/base-install b/base-install
index 3e3454a..b3a7f6e 100755
--- a/base-install
+++ b/base-install
@@ -13,12 +13,20 @@ DIR=`pwd`
 # Not logged
 # Not logged
 [ "`id -u`" = "0" ] && echo "This script must not be run as root" 1>&2 && exit 1
-check_utils "aptitude apt-get git apt-cache dpkg"
+check_utils "aptitude apt-get apt-key git apt-cache dpkg tee wget"
 
 echo
 echo "Base Packages:"
 echo
 echo "Updating index..."
+
+cmd="$WGET -O redland_key.asc $REDLAND_APT_KEY  >/dev/null 2>&1" && run_cmd "$cmd" "Download redland apt-key"
+cmd="$APT_KEY add redland_key.asc >/dev/null 2>&1; rm redland_key.asc" && run_cmd "$cmd" "Adding redland apt-key"
+if ! cat "/etc/apt/sources.list" | grep "$REDLAND_DEB">/dev/null 2>&1; then
+  echo "deb $REDLAND_DEB ./" | sudo $TEE -a /etc/apt/sources.list >/dev/null 
+  echo "deb-src $REDLAND_DEB ./" | sudo $TEE -a /etc/apt/sources.list >/dev/null 
+fi
+
 sudo $APTITUDE update -y >/dev/null 2>&1
 
 DISTRIB_INFO=$(cat /proc/version)
diff --git a/config.sh b/config.sh
index d844d55..30b8912 100755
--- a/config.sh
+++ b/config.sh
@@ -5,7 +5,7 @@
 
 
 # 1) Base setup
-OT_DIST="debian"            # Linux distribution    (debian)
+OT_DIST="debian"            # Linux distribution    (debian, ubuntu)
 OT_INSTALL="local"          # Type                  (gem, local, server)
 OT_BRANCH="development"     # Maturity              (development -need SSH key at Github-, master)
 
@@ -19,10 +19,11 @@ OB_NUM_VER="2.3.1"
 RAPTOR2_NUM_VER="2.0.8"
 RASQAL_NUM_VER="0.9.29"
 RUBY_DWL="http://ftp.ruby-lang.org/pub/ruby/1.9"
+REDLAND_DWL="http://download.librdf.org"
+REDLAND_APT_KEY="http://purl.org/net/dajobe/gnupg.asc"
 
 # Done.
 
-
 ### Nothing to gain from changes below this line.
 JAVA_CONF="$HOME/.opentox/java.sh"
 FST_CONF="$HOME/.opentox/4S.sh"
@@ -40,6 +41,6 @@ RASQAL_VER="rasqal-$RASQAL_NUM_VER"
 OB_DEST="$OT_PREFIX/$OB_VER"
 OB_DEST_BINDINGS="$OT_PREFIX/openbabel-ruby-install"
 
-RAPTOR2_DWL="http://download.librdf.org/source/$RAPTOR2_VER.tar.gz"
-RASQAL_DWL="http://download.librdf.org/source/$RASQAL_VER.tar.gz"
-
+RAPTOR2_DWL="$REDLAND_DWL/source/$RAPTOR2_VER.tar.gz"
+RASQAL_DWL="$REDLAND_DWL/source/$RASQAL_VER.tar.gz"
+REDLAND_DEB="$REDLAND_DWL/binaries/$OT_DIST/unstable"
diff --git a/debian.list b/debian.list
index d16ee3f..86a87c0 100644
--- a/debian.list
+++ b/debian.list
@@ -1,25 +1,18 @@
+aptitude install
+automake install
 build-essential install
 cmake install
+curl install
+libglib2.0-dev install
 libgsl0-dev install
-libtool install
-openjdk-6-jdk install
-r-base install
-r-base-dev install
+libopenbabel4 install
+libopenbabel-dev install
 libpcre3-dev install
-librasqal3-dev install
+libreadline-dev install
+libtool install
 libtool install
-libglib2.0-dev install
 ncurses-dev install
-libreadline-dev install
+openjdk-6-jdk install
+r-base-dev install
+r-base install
 uuid-dev install
-libraptor1-dev install
-libopenbabel4 install
-libopenbabel-dev install
-automake install
-libyaml-dev install
-libopenssl-ruby install
-libssl-dev install
-libxml2-dev install
-libssl-dev install
-curl install
-aptitude install
diff --git a/raptor2-install b/raptor2-install
index ad44ed4..4d3be2e 100755
--- a/raptor2-install
+++ b/raptor2-install
@@ -5,7 +5,7 @@ DIR=`pwd`
 . ./utils.sh || (echo "Utils could not be loaded, check opentox-ui.sh." 1>&2 && exit 1)
 SELF=$(basename $0 -install)
 check_log $SELF
-check_utils "wget tar make grep"
+check_utils "apt-get wget tar make grep"
 
 # Build
 mkdir -p $OT_PREFIX/tmp
@@ -15,6 +15,7 @@ export RAPTOR2_DIR=$OT_PREFIX/$SELF
 cmd="$TAR xvzf $RAPTOR2_VER.tar.gz" && run_cmd "$cmd" "Unpack" 
 rm $RAPTOR2_VER.tar.gz
 cd $RAPTOR2_VER
+cmd="sudo $APT_GET -y build-dep $SELF" && run_cmd "$cmd" "Build dependencies"
 cmd="./configure --prefix=$RAPTOR2_DIR" && run_cmd "$cmd" "Configure"
 cmd="$MAKE" && run_cmd "$cmd" "Make"
 cmd="$MAKE install" && run_cmd "$cmd" "Make Install"
diff --git a/rasqal-install b/rasqal-install
index bc06450..42a7765 100755
--- a/rasqal-install
+++ b/rasqal-install
@@ -5,7 +5,7 @@ DIR=`pwd`
 . ./utils.sh || (echo "Utils could not be loaded, check opentox-ui.sh." 1>&2 && exit 1)
 SELF=$(basename $0 -install)
 check_log $SELF
-check_utils "wget tar make grep"
+check_utils "apt-get wget tar make grep"
 
 # Build
 mkdir -p $OT_PREFIX/tmp
@@ -15,6 +15,7 @@ export RASQAL_DIR=$OT_PREFIX/$SELF
 cmd="$TAR xvzf $RASQAL_VER.tar.gz" && run_cmd "$cmd" "Unpack"
 rm $RASQAL_VER.tar.gz
 cd $RASQAL_VER
+cmd="sudo $APT_GET -y build-dep $SELF" && run_cmd "$cmd" "Build dependencies"
 cmd="./configure --prefix=$RASQAL_DIR" && run_cmd "$cmd" "Configure"
 cmd="$MAKE" && run_cmd "$cmd" "Make"
 cmd="$MAKE install" && run_cmd "$cmd" "Make Install"