Merge branch '2.1.x' into devel

This commit is contained in:
Martin Konecny 2012-08-03 12:53:32 -04:00
commit c3783a15b2
1 changed files with 10 additions and 10 deletions

View File

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