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

diff --git a/stage3/cis-spamassassin b/stage3/cis-spamassassin
index b0b5b6d..b833c0e 100755
--- a/stage3/cis-spamassassin
+++ b/stage3/cis-spamassassin
@@ -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,17 +9,17 @@ source ../functions
 source ../packages-list
 
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${1}
 
-cd ${LFS_TMP}/${1} &&
+cd ${LFS_TMP}/${1}
 perl Makefile.PL -n \
     CONTACT_ADDRESS="postmaster" \
     ENABLE_SSL="no" \
-    RUN_NET_TESTS="no" &&
-make &&
-make install &&
+    RUN_NET_TESTS="no"
+make
+make install
 
-cat > /usr/local/bin/hv-sa-learn << "EOF" &&
+cat > /usr/local/bin/hv-sa-learn << "EOF"
 #!/bin/sh
 
 SA_LEARN="/usr/bin/sa-learn"
@@ -48,18 +50,17 @@ ${SA_LEARN} ${SA_LEARN_FLAGS} -C /etc/mail/spamassassin --ham  /var/mail/ham ||
 
 exit $?
 EOF
-chmod 755 /usr/local/bin/hv-sa-learn &&
+chmod 755 /usr/local/bin/hv-sa-learn
 
 # Addition to /etc/fcron/fcrontab
-string_add "# Run SpamAssassin sa-learn every hour + 25 minutes" /etc/fcron/fcrontab &&
+string_add "# Run SpamAssassin sa-learn every hour + 25 minutes" /etc/fcron/fcrontab
 string_add "&mail(false) 25 * * * * /usr/local/bin/mail-if-fail /usr/local/bin/hv-sa-learn" \
-    /etc/fcron/fcrontab &&
+    /etc/fcron/fcrontab
 
 # Add rule to procmailrc...
 
 # Put spamassassin databases in /srv
-mkdir -v -p /srv/spamassassin &&
+mkdir -v -p /srv/spamassassin
 sed -i -e "s!^bayes_path.*!bayes_path /srv/spamassassin/bayes!g" /etc/mail/spamassassin/local.cf
 
-# Return last error
 exit $?