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

diff --git a/ubuntu/ubuntu-cfg.sh b/ubuntu/ubuntu-cfg.sh
index 1dce21b..60db91c 100755
--- a/ubuntu/ubuntu-cfg.sh
+++ b/ubuntu/ubuntu-cfg.sh
@@ -5,6 +5,7 @@ set -o errexit
 # 1. Désactiver touch CAPS LOCK
 
 #INSTALL_WMAKER=1
+INSTALL_JACKD=1
 
 GST=gstreamer0.10
 
@@ -173,6 +174,7 @@ sudo update-grub
 ${AGI} emacs
 
 ${AGI} reiserfsprogs gparted
+${AGI} smartmontools gddrescue
 
 # Connection serveurs NFS
 ${AGI} nfs-common portmap
@@ -199,12 +201,31 @@ ${AGI} dh-make lintian dupload
 ${AGI} abiword gnumeric gnumeric-plugins-extra
 ${AGI} texlive texlive-latex-recommended texlive-latex-extra texlive-humanities
 
-# Multimedia
-${AGI} jackd patchage
-${AGI} pulseaudio-module-jack
-sudo adduser $(whoami) audio
-# /etc/security/limits.d/audio.conf -> set rtprio from 95 to 99 ???
+# Jackd
+if [ "x${INSTALL_JACKD}" = "x1" ]; then
+    ${AGI} jackd patchage
+    ${AGI} pulseaudio-module-jack
+
+    if [ ! -f ${HOME}/.pulse/pulsejack.pa ]; then
+        cp /etc/pulse/default.pa ${HOME}/.pulse/pulsejack.pa
+    fi
+
+    sudo sed -i -e 's!.*\(autospawn = \).*!\1no!' /etc/pulse/client.conf
 
+    if ! grep "load-module module-jack-source" ${HOME}/.pulse/pulsejack.pa 1> /dev/null 2>&1; then
+        cat >> ${HOME}/.pulse/pulsejack.pa << "EOF"
+
+### JACK setup (Hugo Villeneuve)
+load-module module-jack-source
+load-module module-jack-sink
+EOF
+    fi
+
+    sudo adduser $(whoami) audio
+    # /etc/security/limits.d/audio.conf -> set rtprio from 95 to 99 ???
+fi
+
+# Multimedia
 ${AGI} libdvdread4
 if [ ! -h /usr/lib/libdvdcss.so.2 ]; then
     sudo /usr/share/doc/libdvdread4/install-css.sh
@@ -224,10 +245,13 @@ ${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} vkeybd
 ${AGI} audacity libmp3lame0 tap-plugins
 ${AGI} lilypond
-${AGI} rosegarden
+
+if [ "x${INSTALL_JACKD}" = "x1" ]; then
+    ${AGI} vkeybd
+    ${AGI} rosegarden
+fi
 
 ${AGI} sylpheed
 gconftool -s /desktop/gnome/url-handlers/mailto/command -t string "sylpheed --compose %s"
@@ -255,6 +279,7 @@ EOF
 
 ${AGI} epdfview
 ${AGI} psutils
+${AGI} imagemagick
 ${AGI} gimp
 
 ubuntu_cleanup