X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fcis-pulseaudio;h=7767ed270ec68acdf9c12b2814f50e07ec74d2e1;hb=5f02c8c4b5fe6640bcdb61d1006256289a57c222;hp=ddf553943db98019ccf6c8bea67791587ba197e5;hpb=16cc35ba4890382ee9368a176e4f5a7fa773b7a6;p=hvlinux.git

diff --git a/stage3/cis-pulseaudio b/stage3/cis-pulseaudio
index ddf5539..7767ed2 100755
--- a/stage3/cis-pulseaudio
+++ b/stage3/cis-pulseaudio
@@ -1,4 +1,6 @@
 #!/bin/sh
+set -o errexit
+
 # First argument of this script is the package name
 
 # Reading system configuration informations, functions and package versions.
@@ -6,34 +8,32 @@ source ../sysinfos
 source ../functions
 source ../packages-list
 
-CUR_DIR=$(pwd)
-
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${1}
 
-hv_groupadd pulse &&
-hv_groupadd pulse-access &&
-hv_useradd -g pulse -d /var/run/pulse pulse &&
+hv_groupadd pulse
+hv_groupadd pulse-access
+hv_useradd -g pulse -d /var/run/pulse pulse
 
 gpasswd -a hugo pulse-access
 
 # Il faut ajouter l'usager pulse au groupe audio.
 gpasswd -a pulse audio
 
-cd ${LFS_TMP}/${1}-build &&
+cd ${LFS_TMP}/${1}-build
 ../${1}/configure \
     --prefix=/usr \
     --sysconfdir=/etc \
-    --localstatedir=/var &&
+    --localstatedir=/var
 # Workaround pour éliminer les messages de warning
 # reliés à SHM...
-sed -i -e "s!\(#define HAVE_SHM_OPEN 1\)!/* \1 */!g" config.h &&
+sed -i -e "s!\(#define HAVE_SHM_OPEN 1\)!/* \1 */!g" config.h
 
-make &&
-make install &&
-ldconfig &&
+make
+make install
+ldconfig
 
-cat > /etc/pulse/daemon.conf << "EOF" &&
+cat > /etc/pulse/daemon.conf << "EOF"
 ## Extra verbositiy
 verbose = debug
 
@@ -78,7 +78,7 @@ system-instance = 1
 disable-shm = 1
 EOF
 
-cat > /etc/pulse/default.pa << "EOF" &&
+cat > /etc/pulse/default.pa << "EOF"
 #!/usr/bin/pulseaudio -nF 
 
 #            ----------------
@@ -109,10 +109,9 @@ load-module module-volume-restore
 load-module module-rescue-streams
 EOF
 
-install -v -m740 ${CUR_DIR}/bootscripts/pulseaudio /etc/rc.d/init.d &&
+install -v -m740 ${SCRDIR}/bootscripts/pulseaudio /etc/rc.d/init.d
 
 # script-name start stop
 bootscript_add_rc3 pulseaudio 95 16
 
-# Return last error
 exit $?