Ajout fichier de configuration séparé

diff --git a/ubuntu/config.def.template b/ubuntu/config.def.template
new file mode 100644 (file)
index 0000000..631e394
--- /dev/null
+++ b/ubuntu/config.def.template
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+INSTALL_OPENOFFICE=1
+INSTALL_WMAKER=1
+INSTALL_MUSIC_STUDIO=1
+INSTALL_DEV_TOOLS=1

diff --git a/ubuntu/ubuntu-cfg.sh b/ubuntu/ubuntu-cfg.sh
index 29be224..50326ef 100755 (executable)
--- a/ubuntu/ubuntu-cfg.sh
+++ b/ubuntu/ubuntu-cfg.sh
@@ -1,14 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 set -o errexit
 
+source ./config.def
+
 # Liste des items:
 # 1. Désactiver touch CAPS LOCK
 
-USE_OPENOFFICE=1
-#INSTALL_WMAKER=1
-#INSTALL_MUSIC_STUDIO=1
-#INSTALL_DEV_TOOLS=1
-
 GST=gstreamer0.10
 
 APT="sudo apt-get --yes --force-yes"
@@ -38,7 +35,7 @@ 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 [ "x${USE_OPENOFFICE}" != "x1" ]; then
+if [ "x${INSTALL_OPENOFFICE}" != "x1" ]; then
     if dpkg --list | grep "openoffice" 1> /dev/null 2>&1; then
         ${APT} remove --purge openoffice*
     fi
@@ -178,7 +175,8 @@ sudo update-grub
 ${AGI} emacs
 
 ${AGI} reiserfsprogs gparted
-${AGI} smartmontools gddrescue
+${AGI} gddrescue
+${AGI} smartmontools --no-install-recommends
 
 # Connection serveurs NFS
 ${AGI} nfs-common portmap
@@ -204,9 +202,7 @@ if [ "x${INSTALL_DEV_TOOLS}" = "x1" ]; then
     ${AGI} dh-make lintian dupload
 fi
 
-if [ "x${USE_OPENOFFICE}" = "x1" ]; then
-    ${AGI} abiword gnumeric gnumeric-plugins-extra
-fi
+${AGI} abiword gnumeric gnumeric-plugins-extra
 ${AGI} texlive texlive-latex-recommended texlive-latex-extra texlive-humanities
 
 # Jackd