From 3908e82667571a85c54e934c93dfebf0db0f72a4 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Tue, 13 Jan 2015 15:14:56 -0500 Subject: [PATCH] Add apt.sourcefabric.org to apt sources.list, remove incorrect packages from debian requirements.apt --- install | 16 +++++++++++++--- installer/lib/requirements-debian-wheezy.apt | 2 -- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/install b/install index 41261158e..15c03dd6f 100755 --- a/install +++ b/install @@ -229,9 +229,6 @@ if [ -z web_root -a ! -d web_root ]; then exit 1 fi -dist=`lsb_release -is` -code=`lsb_release -cs` - echo -e "\n _____ .________________________.___ _____ ___________ " echo " / _ \ | \______ \__ ___/| | / \ \_ _____/ " echo " / /_\ \| || _/ | | | |/ \ / \ | __)_ " @@ -247,6 +244,19 @@ if [ "$apache" = "f" -a ${_i} -eq 1 ]; then fi fi +loudCmd "apt-get install -y --force-yes lsb-release" + +dist=`lsb_release -is` +code=`lsb_release -cs` +set +e +grep -E "deb +http://apt.sourcefabric.org/? +$code +main" /etc/apt/sources.list +returncode=$? +set -e +if [ "$returncode" != "0" ]; then + echo "deb http://apt.sourcefabric.org/ $code main" >> /etc/apt/sources.list + apt-get update +fi + if [ "$in_place" = "t" ]; then verbose "\n * Setting current Airtime directory as web root..." web_root=${AIRTIMEROOT}/airtime_mvc/public diff --git a/installer/lib/requirements-debian-wheezy.apt b/installer/lib/requirements-debian-wheezy.apt index b4fd8562f..30df184f1 100644 --- a/installer/lib/requirements-debian-wheezy.apt +++ b/installer/lib/requirements-debian-wheezy.apt @@ -37,8 +37,6 @@ php-apc libmp3lame-dev lame -libzend-framework-php - coreutils sourcefabric-keyring