Mise à jour pour ordinateur de Karine, ajout d'optins pour installer sélectivement...

diff --git a/ubuntu/ubuntu-cfg.sh b/ubuntu/ubuntu-cfg.sh
index eb1bb0c..29be224 100755 (executable)
--- a/ubuntu/ubuntu-cfg.sh
+++ b/ubuntu/ubuntu-cfg.sh
@@ -4,8 +4,10 @@ set -o errexit
 # Liste des items:
 # 1. Désactiver touch CAPS LOCK
 
+USE_OPENOFFICE=1
 #INSTALL_WMAKER=1
-INSTALL_JACKD=1
+#INSTALL_MUSIC_STUDIO=1
+#INSTALL_DEV_TOOLS=1
 
 GST=gstreamer0.10
 
@@ -36,8 +38,10 @@ 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*
+if [ "x${USE_OPENOFFICE}" != "x1" ]; then
+    if dpkg --list | grep "openoffice" 1> /dev/null 2>&1; then
+        ${APT} remove --purge openoffice*
+    fi
 fi
 
 if dpkg --list | grep "samba-common" 1> /dev/null 2>&1; then
@@ -179,30 +183,34 @@ ${AGI} smartmontools gddrescue
 # Connection serveurs NFS
 ${AGI} nfs-common portmap
 
-# Development
 ${AGI} subversion
-${AGI} git
-
-${AGI} build-essential texinfo gettext gawk bison flex
-${AGI} autoconf autoconf-doc autotools-dev libtool
-${AGI} manpages manpages-dev manpages-posix manpages-posix-dev
-
-# dockapp development
-${AGI} libx11-dev libxpm-dev libxext-dev
-${AGI} libgtk2.0-dev libglib2.0-dev
-# wmnotify uses SSL
-${AGI} libssl-dev
-# hvlinux
-${AGI} libncurses-dev
 
-# Debian packaging
-${AGI} dh-make lintian dupload
+# Development
+if [ "x${INSTALL_DEV_TOOLS}" = "x1" ]; then
+    ${AGI} git
+    ${AGI} build-essential texinfo gettext gawk bison flex
+    ${AGI} autoconf autoconf-doc autotools-dev libtool
+    ${AGI} manpages manpages-dev manpages-posix manpages-posix-dev
+
+    # dockapp development
+    ${AGI} libx11-dev libxpm-dev libxext-dev
+    ${AGI} libgtk2.0-dev libglib2.0-dev
+    # wmnotify uses SSL
+    ${AGI} libssl-dev
+    # hvlinux
+    ${AGI} libncurses-dev
+
+    # Debian packaging
+    ${AGI} dh-make lintian dupload
+fi
 
-${AGI} abiword gnumeric gnumeric-plugins-extra
+if [ "x${USE_OPENOFFICE}" = "x1" ]; then
+    ${AGI} abiword gnumeric gnumeric-plugins-extra
+fi
 ${AGI} texlive texlive-latex-recommended texlive-latex-extra texlive-humanities
 
 # Jackd
-if [ "x${INSTALL_JACKD}" = "x1" ]; then
+if [ "x${INSTALL_MUSIC_STUDIO}" = "x1" ]; then
     ${AGI} jackd patchage
     sudo sed -i -e 's!^\(@audio\s*-\s*rtprio\s*\).*!\199!' \
         /etc/security/limits.d/audio.conf
@@ -235,31 +243,33 @@ fi
 ${AGI} ffmpeg
 ${AGI} ${GST}-ffmpeg ${GST}-plugins-bad ${GST}-plugins-ugly ${GST}-fluendo-mp3
 ${AGI} mozilla-plugin-gnash # Requires "mysql-common"
-${AGI} vlc mozilla-plugin-vlc
 if [ -h /dev/cdrom ]; then # Don't install on machines without CD/DVD-ROM
+${AGI} vlc mozilla-plugin-vlc
     ${AGI} sound-juicer
 fi
 
 # Musique
 ${AGI} vorbis-tools
-
 ${AGI} timidity fluid-soundfont-gm fluid-soundfont-gs
-# Désactivation de Timidity au démarrage (sytem-wide):
-sudo sed -i -e 's!^# \(TIM_ALSASEQ=false\)!\1!' /etc/default/timidity
 ${AGI} easytag
 ${AGI} audacity libmp3lame0 tap-plugins
-${AGI} lilypond
 
-if [ "x${INSTALL_JACKD}" = "x1" ]; then
+if [ "x${INSTALL_MUSIC_STUDIO}" = "x1" ]; then
+    # Désactivation de Timidity au démarrage (sytem-wide):
+    sudo sed -i -e 's!^# \(TIM_ALSASEQ=false\)!\1!' /etc/default/timidity
+
+    ${AGI} lilypond
     ${AGI} vkeybd
     ${AGI} rosegarden
 fi
 
 ${AGI} sylpheed
 gconftool -s /desktop/gnome/url-handlers/mailto/command -t string "sylpheed --compose %s"
-# Change location of default mail account from ~/Mail to ~/.mail
-sed -i -e 's!^\(    <folder type="mh" name="Mailbox" path="\)Mail"!\1\.mail"!' \
-    ${HOME}/.sylpheed-2.0/folderlist.xml
+if [ -f ${HOME}/.sylpheed-2.0/folderlist.xml ]; then
+    # Change location of default mail account from ~/Mail to ~/.mail 
+    sed -i -e 's!^\(    <folder type="mh" name="Mailbox" path="\)Mail"!\1\.mail"!' \
+        ${HOME}/.sylpheed-2.0/folderlist.xml
+fi
 
 if [ "x${INSTALL_WMAKER}" = "x1" ]; then
     ${AGI} wmaker
@@ -270,14 +280,14 @@ gnome-settings-daemon
 EOF
         chmod 755 ${HOME}/GNUstep/Library/WindowMaker/autostart
     fi
-fi
 
-${AGI} pcmanfm
-cat > ${HOME}/.gtkrc-2.0 << "EOF"
+    ${AGI} pcmanfm
+    cat > ${HOME}/.gtkrc-2.0 << "EOF"
 gtk-icon-theme-name="Tango"
 gtk-enable-event-sounds=0
 gtk-enable-input-feedback-sounds=0
 EOF
+fi
 
 ${AGI} epdfview
 ${AGI} psutils