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

Merge branch '2.1.x' into devel

Browse source 
Conflicts:
	install_full/ubuntu/airtime-full-install
This commit is contained in:
Martin Konecny 2012-08-03 09:45:55 -04:00
commit eb4b3cfcfa
5 changed files with 27 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

19
install_full/ubuntu/airtime-full-install
View file

@ -26,9 +26,10 @@ dist=`lsb_release -is`
if [ "$dist" = "Debian" ]; then
set +e
grep "deb http://www.deb-multimedia.org squeeze main non-free" /etc/apt/sources.list
grep -E "deb +http://www.deb-multimedia.org/? squeeze +main +non-free" /etc/apt/sources.list
returncode=$?
set -e
if [ "$?" -ne "0" ]; then
if [ "$returncode" -ne "0" ]; then
echo "deb http://www.deb-multimedia.org squeeze main non-free" >> /etc/apt/sources.list
fi
fi
@ -57,6 +58,20 @@ else
apt-get -y install libzend-framework-php
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
# Apache Config File
echo "----------------------------------------------------"
echo "2. Apache Config File"