From 1490b25f1fabb6a7197e7d1277736f852f039f85 Mon Sep 17 00:00:00 2001 From: Stefan Dresselhaus Date: Tue, 21 Jan 2014 01:08:17 +0100 Subject: [PATCH] reentered the code for installing libsdl2-2.0.1 as we use functions of it --- deps/getDeps.sh | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/deps/getDeps.sh b/deps/getDeps.sh index c14f278..a0fb5d5 100755 --- a/deps/getDeps.sh +++ b/deps/getDeps.sh @@ -1,5 +1,27 @@ #!/bin/bash +#hack until saucy has 2.0.1 instead of 2.0.0 + +dialog --yesno "Install libSDL2.0.1 from ubuntu trusty?\nCurrently needed for saucy as they only serve 2.0.0 in the repos" 10 50 +install=${?} + +if [[ $install -eq 0 ]] +then + echo "installing libsdl2.0.1" + if [ ! -f "libsdl2-2.0-0_2.0.1+dfsg1-1ubuntu1_amd64.deb" ] + then + wget http://de.archive.ubuntu.com/ubuntu/pool/universe/libs/libsdl2/libsdl2-2.0-0_2.0.1+dfsg1-1ubuntu1_amd64.deb + sudo dpkg -i libsdl2-2.0-0_2.0.1+dfsg1-1ubuntu1_amd64.deb + fi + if [ ! -f "libsdl2-dev_2.0.1+dfsg1-1ubuntu1_amd64.deb" ] + then + wget http://de.archive.ubuntu.com/ubuntu/pool/universe/libs/libsdl2/libsdl2-dev_2.0.1+dfsg1-1ubuntu1_amd64.deb + sudo dpkg -i libsdl2-dev_2.0.1+dfsg1-1ubuntu1_amd64.deb + fi +fi + +## hack end + echo "cloning repositories" if [ ! -d "hsSDL2" ] then @@ -19,6 +41,7 @@ do else echo "building: $d ..." cd "$d" + cabal clean cabal configure cabal build cabal haddock --hyperlink-source @@ -27,23 +50,3 @@ do fi done -#hack until saucy has 2.0.1 instead of 2.0.0 - -#dialog --yesno "Install libSDL2.0.1 from ubuntu trusty?\nCurrently needed for saucy as they only serve 2.0.0 in the repos" 10 50 -#install=${?} -# -#if [[ $install -eq 0 ]] -#then -# echo "installing libsdl2.0.1" -# if [ ! -f "libsdl2-2.0-0_2.0.1+dfsg1-1ubuntu1_amd64.deb" ] -# then -# wget http://de.archive.ubuntu.com/ubuntu/pool/universe/libs/libsdl2/libsdl2-2.0-0_2.0.1+dfsg1-1ubuntu1_amd64.deb -# sudo dpkg -i libsdl2-2.0-0_2.0.1+dfsg1-1ubuntu1_amd64.deb -# fi -# if [ ! -f "libsdl2-dev_2.0.1+dfsg1-1ubuntu1_amd64.deb" ] -# then -# wget http://de.archive.ubuntu.com/ubuntu/pool/universe/libs/libsdl2/libsdl2-dev_2.0.1+dfsg1-1ubuntu1_amd64.deb -# sudo dpkg -i libsdl2-dev_2.0.1+dfsg1-1ubuntu1_amd64.deb -# fi -#fi -