Commit 92125cf3 authored by Brendan Long's avatar Brendan Long

Merge pull request #22 from cablelabs/more-dependency-fixes-for-ubuntu

Run apt-get update as needed, and install add-apt-repository if needed.
parents 91dd5611 b9b17c88
......@@ -108,6 +108,8 @@ if ! $USE_UPSTREAM ; then
fi
if $INSTALL_DEPS ; then
RAN_APT_GET_UPDATE=false
# We need this for installing packages
OS=$(lsb_release -si)
VER=$(lsb_release -sr)
......@@ -115,8 +117,15 @@ if $INSTALL_DEPS ; then
# Setup GStreamer PPA if on Ubuntu < 13.10
if [ "$OS" == "Ubuntu" ] && [ ! "$VER" == "13.10" ] && [ ! -f /etc/apt/sources.list.d/gstreamer-developers-ppa-*.list ] ; then
echo "Setting up GStreamer PPA"
if ! hash add-apt-repository 2> /dev/null ; then
if ! $RAN_APT_GET_UPDATE ; then
sudo apt-get update
fi
sudo apt-get install -y python-software-properties
fi
sudo add-apt-repository -y ppa:gstreamer-developers/ppa
sudo apt-get update
RAN_APT_GET_UPDATE=true
fi
# Get build dependencies
......@@ -139,7 +148,12 @@ if $INSTALL_DEPS ; then
done
if [ "$OS" == "Ubuntu" ]; then
if ! hash apt-rdepends ; then
if ! $RAN_APT_GET_UPDATE ; then
sudo apt-get update
RAN_APT_GET_UPDATE=true
fi
if ! hash apt-rdepends 2> /dev/null ; then
sudo apt-get -y install apt-rdepends
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment