From 8d2348606c2a047633bb754e54ff1ee3850b6f53 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Fri, 3 Aug 2012 12:53:11 -0400 Subject: [PATCH] CC-4147: Make Airtime work nicer with Debian package generation scripts. -make sure we modify sources.list before doing apt-get update --- install_full/ubuntu/airtime-full-install | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/install_full/ubuntu/airtime-full-install b/install_full/ubuntu/airtime-full-install index b97df1757..0f74b8ed3 100755 --- a/install_full/ubuntu/airtime-full-install +++ b/install_full/ubuntu/airtime-full-install @@ -34,6 +34,15 @@ if [ "$dist" = "Debian" ]; then fi fi +codename=`lsb_release -sc` +set +e +grep -E "deb +http://apt.sourcefabric.org/? +$codename +main" /etc/apt/sources.list +returncode=$? +set -e +if [ "$returncode" != "0" ]; then + echo "deb http://apt.sourcefabric.org/ $codename main" >> /etc/apt/sources.list +fi + apt-get update # Updated package list @@ -59,15 +68,6 @@ else fi #Install Sourcefabric's custom Liquidsoap debian package -codename=`lsb_release -sc` - -set +e -grep -E "deb +http://apt.sourcefabric.org/? +$codename +main" /etc/apt/sources.list -returncode=$? -set -e -if [ "$returncode" != "0" ]; then - echo "deb http://apt.sourcefabric.org/ $codename main" >> /etc/apt/sources.list -fi apt-get install -y --force-yes sourcefabric-keyring apt-get install -y liquidsoap @@ -83,7 +83,7 @@ if [ ! -f /etc/apache2/sites-available/airtime ]; then a2enmod rewrite php5 service apache2 restart else - echo "Apache config for Airtime already exists..." + echo "Apache config for Airtime already exists..." fi # Enable Icecast