From cc6f301b604c2471db0150ac06c9490a2bd39f1c Mon Sep 17 00:00:00 2001
From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Fri, 17 Sep 2010 23:03:32 +0000
Subject: [PATCH 1/1] Install sound-juicer only if CDROM is present

---
 ubuntu/ubuntu-cfg.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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
-- 
2.20.1