From: gobo72 Date: Tue, 14 Sep 2010 05:05:44 +0000 (+0000) Subject: Do not re-install gnash key if it is already installed X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=f77f82e696597d9a34d1f79c3f79055accbcf345;p=hvlinux.git Do not re-install gnash key if it is already installed --- diff --git a/ubuntu/ubuntu-cfg.sh b/ubuntu/ubuntu-cfg.sh index c191305..00576ca 100755 --- a/ubuntu/ubuntu-cfg.sh +++ b/ubuntu/ubuntu-cfg.sh @@ -7,7 +7,7 @@ set -o errexit GST=gstreamer0.10 -APT="sudo apt-get --yes" +APT="sudo apt-get --yes --force-yes" AGI="${APT} install" if [ "`id -u`" -eq 0 ]; then @@ -22,19 +22,19 @@ if dpkg --list | grep "libmono" 1> /dev/null 2>&1; then ${APT} purge libmono* libgdiplus cli-common libglitz-glx1 libglitz1 fi -if dpkg --list | grep pulseaudio 1> /dev/null 2>&1; then +if dpkg --list | grep "pulseaudio" 1> /dev/null 2>&1; then ${APT} remove --purge pulseaudio* fi -if dpkg --list | grep bluez-gstreamer 1> /dev/null 2>&1; then +if dpkg --list | grep "bluez-gstreamer" 1> /dev/null 2>&1; then ${APT} remove --purge bluetooth bluez bluez-gstreamer bluez-alsa bluez-cups fi -if dpkg --list | grep openoffice 1> /dev/null 2>&1; then +if dpkg --list | grep "openoffice" 1> /dev/null 2>&1; then ${APT} remove --purge openoffice* fi -#if dpkg --list | grep evolution-exchange 1> /dev/null 2>&1; then +#if dpkg --list | grep "evolution-exchange" 1> /dev/null 2>&1; then # ${APT} remove --purge evolution #fi @@ -103,13 +103,19 @@ ${AGI} abiword gnumeric gnumeric-plugins-extra ${AGI} texlive texlive-latex-recommended texlive-latex-extra texlive-humanities # Multimedia -${AGI} linux-rt linux-headers-rt +#{AGI} linux-rt linux-headers-rt ${AGI} jackd ${AGI} libdvdread4 sudo /usr/share/doc/libdvdread4/install-css.sh -${AGI} ${GST}-ffmpeg ${GST}-plugins-bad ${GST}-plugins-ugly -sudo add-apt-repository "deb http://www.getgnash.org/debs/ubuntu lucid main" -${AGI} mozilla-plugin-gnash ${GST}-fluendo-mp3 +${AGI} ffmpeg +${AGI} ${GST}-ffmpeg ${GST}-plugins-bad ${GST}-plugins-ugly ${GST}-fluendo-mp3 +if ! sudo apt-key list | grep "rob@welcomehome.org" 1> /dev/null 2>&1; then + sudo add-apt-repository "deb http://www.getgnash.org/debs/ubuntu lucid main" + wget --directory-prefix=/tmp http://getgnash.org/gnashdev.key + sudo apt-key add /tmp/gnashdev.key + rm /tmp/gnashdev.key +fi +${AGI} mozilla-plugin-gnash ${AGI} vlc vlc-plugin-jack mozilla-plugin-vlc ${AGI} sound-juicer