mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-23 16:19:35 -05:00
ITS#9209 - Use portable command instead of which for determining if binaries are present
This commit is contained in:
parent
27e7da68d7
commit
ce23aee98d
3 changed files with 7 additions and 5 deletions
|
|
@ -21,9 +21,9 @@ if test $WITH_TLS = no ; then
|
|||
exit 0
|
||||
fi
|
||||
|
||||
openssl="$(which openssl 2>/dev/null)"
|
||||
certtool="$(which certtool 2>/dev/null)"
|
||||
base64="$(which base64 2>/dev/null)"
|
||||
openssl="$(command -v openssl 2>/dev/null)"
|
||||
certtool="$(command -v certtool 2>/dev/null)"
|
||||
base64="$(command -v base64 2>/dev/null)"
|
||||
|
||||
mkdir -p $TESTDIR $DBDIR1
|
||||
cp -r $DATADIR/tls $TESTDIR
|
||||
|
|
|
|||
|
|
@ -16,7 +16,8 @@
|
|||
echo "running defines.sh"
|
||||
. $SRCDIR/scripts/defines.sh
|
||||
|
||||
if test ! "`which dsadm`"; then
|
||||
DSADM=`command -v dsadm`
|
||||
if test -z "$DSADM"; then
|
||||
echo "DSEE dsadm not in path, test skipped"
|
||||
exit 0
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -18,7 +18,8 @@ echo "running defines.sh"
|
|||
|
||||
OPATTRS="creatorsName createTimestamp modifiersName modifyTimestamp"
|
||||
|
||||
if test ! "`which dsadm`"; then
|
||||
DSADM=`command -v dsadm`
|
||||
if test -z "$DSADM"; then
|
||||
echo "DSEE dsadm not in path, test skipped"
|
||||
exit 0
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in a new issue