diff options
Diffstat (limited to 'build.sh')
-rwxr-xr-x | build.sh | 18 |
1 files changed, 3 insertions, 15 deletions
@@ -2,16 +2,8 @@ # resolve python-version to use if [ "$PYTHON" == "" ] ; then - if which python >/dev/null 2>&1 + if ! PYTHON=$(command -v python || command -v python2 || command -v python 2.7) then - PYTHON=python - elif which python2 >/dev/null 2>&1 - then - PYTHON=python2 - elif which python2.7 >/dev/null 2>&1 - then - PYTHON=python2.7 - else echo "Unable to locate build-dependency python2.x!" 1>&2 exit 1 fi @@ -19,7 +11,7 @@ fi # validate python-dependency # useful in case of explicitly set option. -if ! which $PYTHON > /dev/null 2>&1 +if ! command -v $PYTHON > /dev/null then echo "Unable to locate build-dependency python2.x ($PYTHON)!" 1>&2 exit 1 @@ -196,11 +188,7 @@ build_native() if [ $__UseNinja == 1 ]; then generator="ninja" buildFile="build.ninja" - if which ninja >/dev/null 2>&1; then - buildTool="ninja" - elif which ninja-build >/dev/null 2>&1; then - buildTool="ninja-build" - else + if ! buildTool=$(command -v ninja || command -v ninja-build); then echo "Unable to locate ninja!" 1>&2 exit 1 fi |