From 138686f389fe48139ddc4a57ac5de363e71b38e7 Mon Sep 17 00:00:00 2001 From: Yaroslav Brustinov Date: Tue, 13 Sep 2016 17:30:14 +0300 Subject: dpdk Python scripts small fixes ensure log dir exists for trex daemon regression: add trex24 setup Sphinx docs remove "capture" tag for compatibility with 1.2 version --- linux/b | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) (limited to 'linux') diff --git a/linux/b b/linux/b index 78d4ca47..e5fbbf36 100755 --- a/linux/b +++ b/linux/b @@ -1,13 +1,28 @@ #! /bin/bash -if python2.7 waf-1.9.3 --help &> /dev/null ; then - python2.7 waf-1.9.3 $@ - exit $? -elif python3 waf-1.9.3 --help &> /dev/null ; then - python3 waf-1.9.3 $@ - exit $? +waf=waf-1.9.3 +p2=${PYTHON:-${PYTHON2:-python2.7}} +p3=${PYTHON3:-python3} + + +# try Pythons which can load waf + +if $p2 $waf --help &> /dev/null; then + $p2 $waf $@ +elif $p3 $waf --help &> /dev/null; then + $p3 $waf $@ + +# waf can't be loaded, print the error with available Python + +elif which $p2 &> /dev/null; then + $p2 $waf $@ +elif which $p3 &> /dev/null; then + $p3 $waf $@ + +# no Python available + else - echo Required Python versions at least 2.7 or 3 + echo Required Python 2.7 or 3 exit 1 fi -- cgit 1.2.3-korg