X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fcis-procmail;h=7e72d394fbd9ae3f3f391c67fac8197eb11ce661;hb=5f02c8c4b5fe6640bcdb61d1006256289a57c222;hp=0ec58b8e26d14e8aee84280d5900999b9e24b713;hpb=16cc35ba4890382ee9368a176e4f5a7fa773b7a6;p=hvlinux.git

diff --git a/stage3/cis-procmail b/stage3/cis-procmail
index 0ec58b8..7e72d39 100755
--- a/stage3/cis-procmail
+++ b/stage3/cis-procmail
@@ -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.
@@ -7,16 +9,16 @@ source ../functions
 source ../packages-list
 
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${1}
 
-cd ${LFS_TMP}/${1} &&
+cd ${LFS_TMP}/${1}
 make \
     BASENAME=/usr \
     LOCKINGTEST=/tmp \
-    install &&
-make install-suid &&
+    install
+make install-suid
 
-cat > /etc/procmailrc << "EOF" &&
+cat > /etc/procmailrc << "EOF"
 # /etc/procmailrc
 #
 SHELL=/bin/sh
@@ -78,9 +80,8 @@ spam
 ${DEFAULT}
 EOF
 
-DOMAIN1=$(echo ${DOMAIN} | sed "s!\(.*\)\.\(.*\)!\1!") &&
-DOMAIN2=$(echo ${DOMAIN} | sed "s!\(.*\)\.\(.*\)!\2!") &&
+DOMAIN1=$(echo ${DOMAIN} | sed "s!\(.*\)\.\(.*\)!\1!")
+DOMAIN2=$(echo ${DOMAIN} | sed "s!\(.*\)\.\(.*\)!\2!")
 sed -i -e "s!_DOMAIN_!${DOMAIN1}\\\.${DOMAIN2}!g" /etc/procmailrc
 
-# Return last error
 exit $?