Add apt.sourcefabric.org to apt sources.list, remove incorrect packages from debian requirements.apt

This commit is contained in:
Duncan Sommerville 2015-01-13 15:14:56 -05:00
parent b82391b931
commit 3908e82667
2 changed files with 13 additions and 5 deletions

16
install
View File

@ -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

View File

@ -37,8 +37,6 @@ php-apc
libmp3lame-dev
lame
libzend-framework-php
coreutils
sourcefabric-keyring