From 9a915794b2eb5425eeb5b622a306d0ade48cbd03 Mon Sep 17 00:00:00 2001
From: davor <vorgrimmlerdavid@gmx.de>
Date: Wed, 1 Oct 2014 15:34:51 +0200
Subject: Added repository for new R version Currently 3.1.1 (2014-07-10)

---
 base-install | 12 ++++++++++--
 config.sh    |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/base-install b/base-install
index 7912e5d..a6c6902 100755
--- a/base-install
+++ b/base-install
@@ -13,7 +13,7 @@ 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 apt-key apt-cache dpkg tee wget"
+check_utils "aptitude apt-get apt-key apt-cache dpkg gpq tee wget"
 
 echo
 echo "Base Packages:"
@@ -22,11 +22,19 @@ echo "Updating index..."
 
 cmd="$WGET -O redland_key.asc $REDLAND_APT_KEY  >/dev/null 2>&1" && run_cmd "$cmd" "Download redland apt-key"
 cmd="sudo $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
+if ! cat "/etc/apt/souraes.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
 
+cmd="$GPQ --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/souraes.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" )
diff --git a/config.sh b/config.sh
index 25cd14e..0d57a61 100755
--- a/config.sh
+++ b/config.sh
@@ -54,6 +54,7 @@ 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"
+CRAN_DEB="http://cran.uni-muenster.de/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"
-- 
cgit v1.2.3