-Completed transition to new ipkg method (ipkg.def), but still problem with eglibc...

[hvlinux.git] / stage3 / cis-sasl2

diff --git a/stage3/cis-sasl2 b/stage3/cis-sasl2
index 9b743d6..abda5e6 100755 (executable)
--- a/stage3/cis-sasl2
+++ b/stage3/cis-sasl2
@@ -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,46 +8,43 @@ source ../sysinfos
 source ../functions
 source ../packages-list
 
-CUR_DIR=$(pwd)
-
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${1}
 
-cd ${LFS_TMP}/${1} &&
+cd ${LFS_TMP}/${1}
 
 # Fixes an issue when compiling Cyrus SASL with GCC-4:
-sed -i '/sasl_global/s/^static //' lib/client.c &&
+sed -i '/sasl_global/s/^static //' lib/client.c
 
 # Puts the saslauthd man page in a more standard location:
-sed -i 's/cat8/man8/' saslauthd/Makefile.in &&
+sed -i 's/cat8/man8/' saslauthd/Makefile.in
 
-cd ${LFS_TMP}/${1}-build &&
+cd ${LFS_TMP}/${1}-build
 ../${1}/configure \
     --prefix=/usr \
     --sysconfdir=/etc \
     --with-dbpath=/var/lib/sasl/sasldb2 \
-    --with-saslauthd=/var/run &&
-make &&
-make install &&
+    --with-saslauthd=/var/run
+make
+make install
 
-cd ${LFS_TMP}/${1} &&
-install -v -m755 -d /usr/share/doc/${1} &&
+cd ${LFS_TMP}/${1}
+install -v -m755 -d /usr/share/doc/${1}
 install -v -m644 doc/{*.{html,txt,fig},ONEWS,TODO} \
-    saslauthd/LDAP_SASLAUTHD /usr/share/doc/${1} &&
-install -v -m700 -d /var/lib/sasl &&
+    saslauthd/LDAP_SASLAUTHD /usr/share/doc/${1}
+install -v -m700 -d /var/lib/sasl
 
 # Creating SASL configuration file for Sendmail:
-cat > /usr/lib/sasl2/Sendmail.conf << "EOF" &&
+cat > /usr/lib/sasl2/Sendmail.conf << "EOF"
 pwcheck_method:saslauthd
 EOF
 
-ldconfig &&
+ldconfig
 
 # Bootscript
-install -v -m740 ${CUR_DIR}/bootscripts/saslauthd /etc/rc.d/init.d &&
+install -v -m740 ${SCRDIR}/bootscripts/saslauthd /etc/rc.d/init.d
 
 # script-name start stop
 bootscript_add_rc3 saslauthd 50 40
 
-# Return last error
 exit $?