Merge branch '2.1.x' into devel
This commit is contained in:
commit
c3783a15b2
|
@ -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
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue