X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fcis-openldap;h=eebb006a0962a8e5fafe2410acbed8f26f72919c;hb=7f1a3e5d69d0b1d64619604c30243e0070dc09ad;hp=cea38daa3e89a668cb91e74904d102e2a74a3d7b;hpb=16cc35ba4890382ee9368a176e4f5a7fa773b7a6;p=hvlinux.git

diff --git a/stage3/cis-openldap b/stage3/cis-openldap
index cea38da..eebb006 100755
--- a/stage3/cis-openldap
+++ b/stage3/cis-openldap
@@ -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,12 +8,10 @@ source ../sysinfos
 source ../functions
 source ../packages-list
 
-CUR_DIR=$(pwd)
-
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${1}
 
-cd ${LFS_TMP}/${1}-build &&
+cd ${LFS_TMP}/${1}-build
 ../${1}/configure \
     --prefix=/usr \
     --libexecdir=/usr/sbin \
@@ -23,19 +23,19 @@ cd ${LFS_TMP}/${1}-build &&
     --enable-modules \
     --enable-rlookups \
     --enable-backends \
-    --enable-overlays &&
-make depend &&
-make &&
-make install &&
+    --enable-overlays
+make depend
+make
+make install
 
 for LINK in lber ldap ldap_r; do
     chmod -v 0755 /usr/lib/$(readlink /usr/lib/lib${LINK}.so)
-done &&
+done
 
-cd ${LFS_TMP}/${1} &&
-install -v -m755 -d /usr/share/doc/${1}/{drafts,guide,rfc} &&
-install -v -m644 doc/drafts/* /usr/share/doc/${1}/drafts &&
-install -v -m644 doc/rfc/*    /usr/share/doc/${1}/rfc &&
+cd ${LFS_TMP}/${1}
+install -v -m755 -d /usr/share/doc/${1}/{drafts,guide,rfc}
+install -v -m644 doc/drafts/* /usr/share/doc/${1}/drafts
+install -v -m644 doc/rfc/*    /usr/share/doc/${1}/rfc
 cp -v -R doc/guide/*          /usr/share/doc/${1}/guide
 
 # Only the slapd daemon is needed.
@@ -43,10 +43,9 @@ cp -v -R doc/guide/*          /usr/share/doc/${1}/guide
 # cooperate in a hierarchy, much like DNS servers.
 
 # Bootscript
-install -v -m740 ${CUR_DIR}/bootscripts/openldap /etc/rc.d/init.d &&
+install -v -m740 ${SCRDIR}/bootscripts/openldap /etc/rc.d/init.d
 
 # script-name start stop
 bootscript_add_rc3 openldap 60 30
 
-# Return last error
 exit $?