X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=ubuntu%2Fubuntu-cfg.sh;h=d780e1cb7146cc373910733155f578bac34ac337;hb=cc6f301b604c2471db0150ac06c9490a2bd39f1c;hp=35b9f04c789e3032464ffc6356d1919d124c8d0d;hpb=d1010b9f0b0f540315850de51dfe03a065a7514e;p=hvlinux.git

diff --git a/ubuntu/ubuntu-cfg.sh b/ubuntu/ubuntu-cfg.sh
index 35b9f04..d780e1c 100755
--- a/ubuntu/ubuntu-cfg.sh
+++ b/ubuntu/ubuntu-cfg.sh
@@ -54,7 +54,7 @@ if dpkg --list | grep "totem-common" 1> /dev/null 2>&1; then
 fi
 
 if dpkg --list | grep "gwibber" 1> /dev/null 2>&1; then
-    ${APT} remove --purge gwibber
+    ${APT} remove --purge gwibber gwibber-service
 fi
 
 # Configuration SSH
@@ -150,7 +150,9 @@ if ! sudo apt-key list | grep "rob@welcomehome.org" 1> /dev/null 2>&1; then
 fi
 ${AGI} mozilla-plugin-gnash
 ${AGI} vlc vlc-plugin-jack mozilla-plugin-vlc
-${AGI} sound-juicer
+if [ -h /media/cdrom ]; then # Don't install on machines without CD/DVD-ROM 
+    ${AGI} sound-juicer
+fi
 
 # Musique
 ${AGI} vorbis-tools