Merge branch 'v0.04'

Conflicts:
	scripts/install_precise.sh
This commit is contained in:
Santi Noreña 2013-05-07 14:32:57 +02:00
commit c91b183a81
10 changed files with 101 additions and 190 deletions

View file

@ -18,7 +18,7 @@ if [ "$output" -eq "0" ]; then
echo "deb http://apt.openlighting.org/ubuntu precise main" >> /etc/apt/sources.list
fi
apt-get update
apt-get -y --force-yes install ola libqtcore4 libqtgui4 libmagick++4 libav-tools
apt-get -y --force-yes install ola libqtcore4 libqtgui4 libmagick++4 libav-tools libftgl2 libavifile-0.7c2 libgmerlin-avdec1 libmpeg3-1
if [ "$?" -eq "0" ]; then
echo "apt-get finish ok"
else echo "apt-get return errors!"

View file

@ -8,13 +8,19 @@
###############################################################################
# Comprobamos root
(( EUID )) && echo You need to be root. && exit 1
#Instalamos el paquete suministrado con el release
dpkg -i ola_0.8.26-1_i386.deb
# Install Pure Data y OLA
# libav para generar thumbs
apt-get -y --force-yes install libav-tools libqtcore4 libqtgui4 libmagick++5
# Instalamos OLA desde el repositorio del proyecto
# copia de seguridad de sources.list
cp /etc/apt/sources.list /etc/apt/sources.list.old
# Comprobamos que el repositorio no está en soucers.list
output=`grep apt.openlighting.org /etc/apt/sources.list | wc -l`
if [ "$output" -eq "0" ]; then
#Añadimos el repositorio ola a sources.list
echo "deb http://apt.openlighting.org/debian/ wheezy main" >> /etc/apt/sources.list
fi
apt-get update
apt-get -y --force-yes install ola libav-tools libqtcore4 libqtgui4 libqt4-script libqtwebkit4 libftgl2 libmagick++5 tcl tk
if [ "$?" -eq "0" ]; then
echo "apt-get finish ok"
else "apt-get return errors!"
else echo "apt-get return errors!"
fi
apt-get -f install