svn commit: samba r18244 - in branches/SAMBA_4_0/source/lib/ldb/tests: .

[tridge at samba.org]

Author: tridge
Date: 2006-09-08 03:28:39 +0000 (Fri, 08 Sep 2006)
New Revision: 18244

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18244

Log:

more portable shell scripting

Modified:
   branches/SAMBA_4_0/source/lib/ldb/tests/init_slapd.sh


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/tests/init_slapd.sh
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/tests/init_slapd.sh	2006-09-08 03:06:47 UTC (rev 18243)
+++ branches/SAMBA_4_0/source/lib/ldb/tests/init_slapd.sh	2006-09-08 03:28:39 UTC (rev 18244)
@@ -24,18 +24,18 @@
 rm -f $MODCONF
 touch $MODCONF || exit 1
 
-if ! slaptest -u -f $LDBDIR/tests/slapd.conf > /dev/null 2>&1; then
-echo "enabling sladp modules"
-cat > $MODCONF <<EOF 
+slaptest -u -f $LDBDIR/tests/slapd.conf > /dev/null 2>&1 || {
+ echo "enabling sladp modules"
+cat > $MODCONF <<EOF
 modulepath	/usr/lib/ldap
 moduleload	back_bdb
 EOF
-fi
+}
 
-if ! slaptest -u -f $LDBDIR/tests/slapd.conf; then
+slaptest -u -f $LDBDIR/tests/slapd.conf || {
     echo "slaptest failed - skipping ldap tests"
     exit 0
-fi
+}
 
 slapadd -f $LDBDIR/tests/slapd.conf < $LDBDIR/tests/init.ldif || exit 0