Replace "which" with "command -v"

Since the latter is at least semi-POSIX compliant:

http://pubs.opengroup.org/onlinepubs/009696899/utilities/command.html

Avoids the need for #1486
This commit is contained in:
Peter Eckersley 2015-11-13 01:30:34 -08:00
parent 153022c842
commit 3551ffbd64
2 changed files with 4 additions and 4 deletions

View file

@ -44,7 +44,7 @@ apt-get install -y --no-install-recommends \
libffi-dev \
ca-certificates \
if ! which virtualenv > /dev/null ; then
if ! command -v virtualenv > /dev/null ; then
echo Failed to install a working \"virtualenv\" command, exiting
exit 1
fi

View file

@ -83,11 +83,11 @@ ExperimentalBootstrap() {
}
DeterminePythonVersion() {
if which python2 > /dev/null ; then
if command -v python2 > /dev/null ; then
export LE_PYTHON=${LE_PYTHON:-python2}
elif which python2.7 > /dev/null ; then
elif command -v python2.7 > /dev/null ; then
export LE_PYTHON=${LE_PYTHON:-python2.7}
elif which python > /dev/null ; then
elif command -v python > /dev/null ; then
export LE_PYTHON=${LE_PYTHON:-python}
else
echo "Cannot find any Pythons... please install one!"