Do not re-install gnash key if it is already installed

[hvlinux.git] / ubuntu / ubuntu-cfg.sh

diff --git a/ubuntu/ubuntu-cfg.sh b/ubuntu/ubuntu-cfg.sh
index 66ee9a0..00576ca 100755 (executable)
--- 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,14 +22,22 @@ 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
+    ${APT} remove --purge openoffice*
+fi
+
+#if dpkg --list | grep "evolution-exchange" 1> /dev/null 2>&1; then
+#    ${APT} remove --purge evolution
+#fi
+
 # Configuration SSH
 if [ ! -f ${HOME}/.ssh/id_dsa.pub ]; then
     ssh-keygen -t dsa
@@ -48,6 +56,7 @@ gconftool-2 --set /apps/nautilus/preferences/preview_sound --type string never
 gconftool-2 --set /apps/nautilus/preferences/show_directory_item_counts --type string never
 gconftool-2 --set /apps/nautilus/preferences/show_icon_text --type string never
 gconftool-2 --set /apps/nautilus/preferences/show_image_thumbnails --type string never
+gconftool-2 --set /apps/nautilus/preferences/media_automount_open --type bool false
 
 # Démarrage de Rhythmbox non minimisé
 gconftool-2 --set /apps/rhythmbox/plugins/status-icon/window-visible --type boolean true
@@ -56,11 +65,17 @@ ${APT} update
 ${APT} upgrade
 ${APT} dist-upgrade
 ${APT} autoremove
+${APT} clean
+${APT} autoclean
 
 # localepurge is a simple script to recover diskspace wasted for unneeded locale files and localized man pages.
 # It will automagically be invoked upon completion of any apt installation run.
 ${AGI} localepurge
 
+if lspci | grep "BCM43" 1> /dev/null 2>&1; then
+    ${AGI} b43-fwcutter
+fi
+
 ${AGI} emacs23
 # Correction bug avec emacs:
 #   murrine_style_draw_box: assertion `height >= -1' failed
@@ -88,11 +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} 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
 
@@ -108,11 +131,13 @@ ${AGI} sylpheed
 gconftool -s /desktop/gnome/url-handlers/mailto/command -t string "sylpheed --compose %s"
 
 ${AGI} wmaker
-cat > ${HOME}/GNUstep/Library/WindowMaker/autostart << "EOF"
+if [ -d ${HOME}/GNUstep/Library/WindowMaker ]; then
+    cat > ${HOME}/GNUstep/Library/WindowMaker/autostart << "EOF"
 #!/bin/sh
 gnome-settings-daemon
 EOF
-chmod 755 ${HOME}/GNUstep/Library/WindowMaker/autostart
+    chmod 755 ${HOME}/GNUstep/Library/WindowMaker/autostart
+fi
 
 ${AGI} pcmanfm
 cat > ${HOME}/.gtkrc-2.0 << "EOF"
@@ -125,7 +150,7 @@ ${AGI} epdfview
 ${AGI} psutils
 ${AGI} gimp
 
-if lspci  | grep "nVidia" 1> /dev/null 2>&1; then
+if lspci | grep "nVidia" 1> /dev/null 2>&1; then
     ${AGI} nvidia-settings nvidia-current
 fi