X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=ubuntu%2Fubuntu-cfg.sh;h=c3a3fe9274f6efdc873500676dd9f26874d392d2;hb=2ad910e22979500192ea43d5599ad003440744a4;hp=60db91c742698f48a154393013eca258d0f19ba7;hpb=5127a0d725b40429f8f7bfe58f877b03906ccb6d;p=hvlinux.git

diff --git a/ubuntu/ubuntu-cfg.sh b/ubuntu/ubuntu-cfg.sh
index 60db91c..c3a3fe9 100755
--- a/ubuntu/ubuntu-cfg.sh
+++ b/ubuntu/ubuntu-cfg.sh
@@ -1,16 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 set -o errexit
 
+source ./config.def
+
 # Liste des items:
 # 1. Désactiver touch CAPS LOCK
 
-#INSTALL_WMAKER=1
-INSTALL_JACKD=1
-
 GST=gstreamer0.10
 
 APT="sudo apt-get --yes --force-yes"
 AGI="${APT} install"
+AGINR="${AGI} --no-install-recommends"
 
 ubuntu_cleanup()
 {
@@ -20,6 +20,12 @@ ubuntu_cleanup()
     ${APT} autoclean
 }
 
+hv_add_repo()
+{
+    sudo add-apt-repository ${1}
+    ${APT} update
+}
+
 if [ "`id -u`" -eq 0 ]; then
     echo "You must NOT be the super-user to execute this script"
     exit 1
@@ -36,8 +42,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${INSTALL_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
@@ -45,7 +53,11 @@ if dpkg --list | grep "samba-common" 1> /dev/null 2>&1; then
 fi
 
 if dpkg --list | grep "evolution-exchange" 1> /dev/null 2>&1; then
-    ${APT} remove --purge evolution
+    ${APT} remove --purge evolution evolution-plugins evolution-webcal evolution-data-server evolution-indicator evolution-common
+fi
+
+if dpkg --list | grep "empathy-common" 1> /dev/null 2>&1; then
+    ${APT} remove --purge empathy*
 fi
 
 if dpkg --list | grep "pppconfig" 1> /dev/null 2>&1; then
@@ -64,6 +76,10 @@ if dpkg --list | grep "vinagre" 1> /dev/null 2>&1; then
     ${APT} remove --purge vinagre
 fi
 
+if dpkg --list | grep "modemmanager" 1> /dev/null 2>&1; then
+    ${APT} remove --purge modemmanager
+fi
+
 # Braille
 if dpkg --list | grep "brltty" 1> /dev/null 2>&1; then
     ${APT} remove --purge brltty
@@ -174,36 +190,48 @@ sudo update-grub
 ${AGI} emacs
 
 ${AGI} reiserfsprogs gparted
-${AGI} smartmontools gddrescue
+${AGI} gddrescue
+${AGINR} smartmontools
 
 # 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
+# Development
+if [ "x${INSTALL_DEV_TOOLS}" = "x1" ]; then
+    ${AGI} git
+    # Set global configuration options to ~/.gitconfig
+    git config --global core.editor emacs
+    git config --global color.ui true
+    ${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
 
-# Debian packaging
-${AGI} dh-make lintian dupload
+if [ "x${INSTALL_WEB_SERVER}" = "x1" ]; then
+    ${AGI} libapache2-mod-php5
+fi
 
 ${AGI} abiword gnumeric gnumeric-plugins-extra
 ${AGI} texlive texlive-latex-recommended texlive-latex-extra texlive-humanities
 
 # Jackd
-if [ "x${INSTALL_JACKD}" = "x1" ]; then
-    ${AGI} jackd patchage
+if [ "x${INSTALL_MUSIC_STUDIO}" = "x1" ]; then
+    ${AGINR} jackd patchage
+    sudo sed -i -e 's!^\(@audio\s*-\s*rtprio\s*\).*!\199!' \
+        /etc/security/limits.d/audio.conf
     ${AGI} pulseaudio-module-jack
 
     if [ ! -f ${HOME}/.pulse/pulsejack.pa ]; then
@@ -232,34 +260,52 @@ if [ ! -h /usr/lib/libdvdcss.so.2 ]; then
 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
+${AGI} libavcodec-extra-52
+if [ "x${INSTALL_GNASH}" = "x1" ]; then
+    ${AGI} mozilla-plugin-gnash # Requires "mysql-common"
+else
+    if dpkg --list | grep "gnash" 1> /dev/null 2>&1; then
+        ${APT} remove --purge gnash*
+    fi
+fi
 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
+    ${AGI} ardour
 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
+
+# Chromium
+hv_add_repo "ppa:chromium-daily/ppa"
+${AGI} chromium-browser
 
-if [ "x${INSTALL_WMAKER}" = "x1" ]; then
+if [ "x${INSTALL_NETBOOK}" = "x1" ]; then
+    ${AGI} battery-status
+    ${AGI} maximus
+    ${AGI} window-picker-applet
+else
     ${AGI} wmaker
     if [ -d ${HOME}/GNUstep/Library/WindowMaker ]; then
         cat > ${HOME}/GNUstep/Library/WindowMaker/autostart << "EOF"
@@ -268,20 +314,23 @@ 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
 ${AGI} imagemagick
 ${AGI} gimp
 
+# Pour changer la couleur des scrollbars (gris sur gris par défaut)
+${AGI} gnome-color-chooser
+
 ubuntu_cleanup
 
 exit $?