Author: tridge Date: 2006-08-24 01:03:42 +0000 (Thu, 24 Aug 2006) New Revision: 17765
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17765 Log: fix handling of old solaris /bin/sh in ldb build/test Modified: branches/SAMBA_4_0/source/lib/ldb/docs/builddocs.sh branches/SAMBA_4_0/source/lib/ldb/tests/test-generic.sh branches/SAMBA_4_0/source/lib/ldb/tests/test-ldap.sh Changeset: Modified: branches/SAMBA_4_0/source/lib/ldb/docs/builddocs.sh =================================================================== --- branches/SAMBA_4_0/source/lib/ldb/docs/builddocs.sh 2006-08-24 00:41:15 UTC (rev 17764) +++ branches/SAMBA_4_0/source/lib/ldb/docs/builddocs.sh 2006-08-24 01:03:42 UTC (rev 17765) @@ -5,7 +5,7 @@ XSLTPROC="$1" SRCDIR="$2" -if ! test -x "$XSLTPROC"; then +if [ -z "$XSLTPROC" ] || [ ! -x "$XSLTPROC" ]; then echo "xsltproc not installed" exit 0 fi Modified: branches/SAMBA_4_0/source/lib/ldb/tests/test-generic.sh =================================================================== --- branches/SAMBA_4_0/source/lib/ldb/tests/test-generic.sh 2006-08-24 00:41:15 UTC (rev 17764) +++ branches/SAMBA_4_0/source/lib/ldb/tests/test-generic.sh 2006-08-24 01:03:42 UTC (rev 17765) @@ -1,7 +1,8 @@ #!/bin/sh if [ -z "$LDB_SPECIALS" ]; then - export LDB_SPECIALS=1 + LDB_SPECIALS=1 + export LDB_SPECIALS fi echo "LDB_URL: $LDB_URL" Modified: branches/SAMBA_4_0/source/lib/ldb/tests/test-ldap.sh =================================================================== --- branches/SAMBA_4_0/source/lib/ldb/tests/test-ldap.sh 2006-08-24 00:41:15 UTC (rev 17764) +++ branches/SAMBA_4_0/source/lib/ldb/tests/test-ldap.sh 2006-08-24 01:03:42 UTC (rev 17765) @@ -1,6 +1,7 @@ #!/bin/sh -export PATH=/usr/local/sbin:/usr/sbin:/sbin:$PATH +PATH=/usr/local/sbin:/usr/sbin:/sbin:$PATH +export PATH SCHEMA_NEEDED="core nis cosine inetorgperson openldap" # setup needed schema files @@ -29,7 +30,8 @@ export LDBDIR fi -export LDB_URL=`$LDBDIR/tests/ldapi_url.sh` +LDB_URL=`$LDBDIR/tests/ldapi_url.sh` +export LDB_URL PATH=bin:$PATH export PATH @@ -37,5 +39,6 @@ . $LDBDIR/tests/init_slapd.sh . $LDBDIR/tests/start_slapd.sh -export LDB_SPECIALS=0 +LDB_SPECIALS=0 +export LDB_SPECIALS . $LDBDIR/tests/test-generic.sh