Merge branch 'builddep' into development

Conflicts:
	4store-install
	base-install
	config.sh
	utils.sh

1 files changed, 10 insertions, 2 deletions

diff --git a/base-install b/base-install
index c7d717e..6e549d8 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 apt-cache dpkg"
+check_utils "aptitude apt-get apt-key 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)
@@ -30,7 +38,7 @@ case "$DISTRIB_INFO" in
 esac
 
 sudo $DPKG --set-selections < "$PACK_LIST"
-sudo $APT_GET -y -u dselect-upgrade
+sudo $APT_GET -y --force-yes -u dselect-upgrade
 
 if [ ! -f $JAVA_CONF ]; then