kevin/libsodium
1
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2024-12-23 20:15:19 -07:00
Code Releases Wiki Activity

Replace which with command for portability (#542)

Browse Source 
The `which` command is not part of the posix standard and not available
in some environments.  The `command` command is part of the posix
standard and well supported.

See https://unix.stackexchange.com/q/85249 for a discussion about the
use of `command` instead of `which`.

If a system had `libtool` but not `which`, the build process would issue
an erroneous error stating:

    libtool is required, but wasn't found on this system

Switching to `command` corrects this problem.
This commit is contained in:
Jim Patterson 2017-05-19 08:51:56 -04:00 committed by Frank Denis
parent 00212b2604
commit 1fd6a4bfc2
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
autogen.sh
View File

@ -6,20 +6,25 @@ else
LIBTOOLIZE='libtoolize' LIBTOOLIZE='libtoolize'
fi fi
if [ ! -x "`which $LIBTOOLIZE 2>/dev/null`" ] ; then command -v command >/dev/null 2>&1 || {
echo "command is required, but wasn't found on this system"
exit 1
}
command -v $LIBTOOLIZE >/dev/null 2>&1 || {
echo "libtool is required, but wasn't found on this system" echo "libtool is required, but wasn't found on this system"
exit 1 exit 1
fi }
if [ ! -x "`which autoconf 2>/dev/null`" ] ; then command -v autoconf >/dev/null 2>&1 || {
echo "autoconf is required, but wasn't found on this system" echo "autoconf is required, but wasn't found on this system"
exit 1 exit 1
fi }
if [ ! -x "`which automake 2>/dev/null`" ] ; then command -v automake >/dev/null 2>&1 || {
echo "automake is required, but wasn't found on this system" echo "automake is required, but wasn't found on this system"
exit 1 exit 1
fi }
if autoreconf --version > /dev/null 2>&1 ; then if autoreconf --version > /dev/null 2>&1 ; then
exec autoreconf -ivf exec autoreconf -ivf

5
test/default/nacl-test-wrapper.sh
View File

@ -16,7 +16,10 @@ else
fi fi
fi fi
which python >/dev/null 2>&1 || \ command -v command >/dev/null 2>&1 || \
{ echo "command is required, but wasn't found on this system"; exit 1; }
command -v python >/dev/null 2>&1 || \
{ echo >&2 "Python not found. Aborting."; exit 1; } { echo >&2 "Python not found. Aborting."; exit 1; }
SEL_LDR=$(find "$NACL_SDK_ROOT" -name sel_ldr.py | head -n 1) SEL_LDR=$(find "$NACL_SDK_ROOT" -name sel_ldr.py | head -n 1)