Ajout variable manquante HV_FONTS_DIR

[hvlinux.git] / stage3 / cis-hal

diff --git a/stage3/cis-hal b/stage3/cis-hal
index 3b66cad..9a0bc7e 100755 (executable)
--- a/stage3/cis-hal
+++ b/stage3/cis-hal
@@ -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,29 +8,27 @@ source ../sysinfos
 source ../functions
 source ../packages-list
 
-CUR_DIR=$(pwd)
-
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${1}
 
-hv_groupadd -g 19 haldaemon &&
+hv_groupadd -g 19 haldaemon
 hv_useradd -c HAL-Daemon-User -d /dev/null -u 19 \
-    -g haldaemon -s /bin/false haldaemon &&
+    -g haldaemon -s /bin/false haldaemon
 
-cd ${LFS_TMP}/${1}-build &&
+cd ${LFS_TMP}/${1}-build
 ../${1}/configure \
     --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib/hal \
     --localstatedir=/var \
-    --with-hwdata=/usr/share/pciutils/pci.ids &&
-make &&
-make install &&
-install -v -m755 -d /var/run/hald &&
-ldconfig &&
+    --with-hwdata=/usr/share/pciutils/pci.ids
+make
+make install
+install -v -m755 -d /var/run/hald
+ldconfig
 
 # Bootscript
-install -v -m740 ${CUR_DIR}/bootscripts/hald /etc/rc.d/init.d &&
+install -v -m740 ${SCRDIR}/bootscripts/hald /etc/rc.d/init.d
 
 # script-name start stop
 bootscript_add_rc3 hald 93 19
@@ -36,10 +36,9 @@ bootscript_add_rc3 hald 93 19
 # If the system-wide D-BUS daemon was running during the
 # installation of HAL, ensure you stop and restart the
 # D-BUS daemon before attempting to start the hald daemon.
-#/etc/rc.d/init.d/dbus restart &&
+#/etc/rc.d/init.d/dbus restart
 
 # Starting daemon
 #/etc/rc.d/init.d/hal start
 
-# Return last error
 exit $?