package-update stage4 (xorg) ok

[hvlinux.git] / stage3 / cis-dbus

diff --git a/stage3/cis-dbus b/stage3/cis-dbus
index d118d52..bb1abf8 100755 (executable)
--- a/stage3/cis-dbus
+++ b/stage3/cis-dbus
@@ -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,26 +8,24 @@ source ../sysinfos
 source ../functions
 source ../packages-list
 
-CUR_DIR=$(pwd)
-
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${1}
 
-hv_groupadd -g 18 messagebus &&
+hv_groupadd -g 18 messagebus
 hv_useradd -c D-BUS-Message-Daemon-User -d /dev/null \
-    -u 18 -g messagebus -s /bin/false messagebus &&
+    -u 18 -g messagebus -s /bin/false messagebus
 
-cd ${LFS_TMP}/${1}-build &&
+cd ${LFS_TMP}/${1}-build
 ../${1}/configure \
     --prefix=/usr \
     --sysconfdir=/etc \
-    --localstatedir=/var &&
-make &&
-make install &&
-ldconfig &&
+    --localstatedir=/var
+make
+make install
+ldconfig
 
 # Bootscript
-install -v -m740 ${CUR_DIR}/bootscripts/dbus /etc/rc.d/init.d &&
+install -v -m740 ${SCRDIR}/bootscripts/dbus /etc/rc.d/init.d
 
 # script-name start stop
 bootscript_add_rc3 dbus 92 20
@@ -33,7 +33,7 @@ bootscript_add_rc3 dbus 92 20
 # Starting the session daemon here has the added bonus that it will exit
 # when you log out of your GNOME session. If you wish to start the daemon
 #here, use the following command instead of the one shown above:
-######echo "exec dbus-launch --exit-with-session gnome-session" >> ~/.xinitrc &&
+######echo "exec dbus-launch --exit-with-session gnome-session" >> ~/.xinitrc
 
 # Return last error
 exit $?