Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.1.x' into devel

This commit is contained in:
Martin Konecny 2012-08-03 12:53:32 -04:00
parent 42738c98a3 8d2348606c
commit c3783a15b2
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
install_full/ubuntu/airtime-full-install
View File

@ -34,6 +34,15 @@ if [ "$dist" = "Debian" ]; then
fi fi
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 apt-get update
# Updated package list # Updated package list
@ -59,15 +68,6 @@ else
fi fi
#Install Sourcefabric's custom Liquidsoap debian package #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 --force-yes sourcefabric-keyring
apt-get install -y liquidsoap apt-get install -y liquidsoap
@ -83,7 +83,7 @@ if [ ! -f /etc/apache2/sites-available/airtime ]; then
a2enmod rewrite php5 a2enmod rewrite php5
service apache2 restart service apache2 restart
else else
echo "Apache config for Airtime already exists..." echo "Apache config for Airtime already exists..."
fi fi
# Enable Icecast # Enable Icecast