From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.151; helo=mga17.intel.com; envelope-from=bob.c.feng@intel.com; receiver=edk2-devel@lists.01.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C325C211BB8C6 for ; Thu, 24 Jan 2019 21:05:18 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Jan 2019 21:05:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,519,1539673200"; d="scan'208";a="294272606" Received: from shwdepsi1121.ccr.corp.intel.com ([10.239.158.47]) by orsmga005.jf.intel.com with ESMTP; 24 Jan 2019 21:05:17 -0800 From: "Feng, Bob C" To: edk2-devel@lists.01.org Cc: Zhijux Fan , Bob Feng , Liming Gao Date: Fri, 25 Jan 2019 12:56:19 +0800 Message-Id: <20190125045626.14700-27-bob.c.feng@intel.com> X-Mailer: git-send-email 2.20.1.windows.1 In-Reply-To: <20190125045626.14700-1-bob.c.feng@intel.com> References: <20190125045626.14700-1-bob.c.feng@intel.com> MIME-Version: 1.0 Subject: [Patch 26/33] BaseTools:Linux Python highest version check. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jan 2019 05:05:19 -0000 Content-Transfer-Encoding: 8bit From: Zhijux Fan Linux Python highest version check. The path of Python interpreter assign values to PYTHON_COMMAND Cc: Bob Feng Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Zhiju.Fan --- edksetup.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/edksetup.sh b/edksetup.sh index 06f95f4b9c..bfa54ddf70 100755 --- a/edksetup.sh +++ b/edksetup.sh @@ -113,15 +113,18 @@ function SetupEnv() function SetupPython() { if [ $PYTHON3_ENABLE ] && [ $PYTHON3_ENABLE == TRUE ] then - for python in $(which python3) + if [ $origin_version ];then + origin_version= + fi + for python in $(whereis python3) do python=$(echo $python | grep "[[:digit:]]$" || true) python_version=${python##*python} - if [ -z "${python_version}" ];then + if [ -z "${python_version}" ] || (! command -v $python >/dev/null 2>&1);then continue fi if [ -z $origin_version ];then origin_version=$python_version export PYTHON=$python @@ -135,18 +138,21 @@ function SetupPython() done fi if [ -z $PYTHON3_ENABLE ] || [ $PYTHON3_ENABLE != TRUE ] then - for python in $(which python2) + if [ $origin_version ];then + origin_version= + fi + for python in $(whereis python2) do python=$(echo $python | grep "[[:digit:]]$" || true) python_version=${python##*python} - if [ -z "${python_version}" ];then + if [ -z "${python_version}" ] || (! command -v $python >/dev/null 2>&1);then continue fi - if [ -z $origin_version ] || [ $origin_version -ge 3 ] + if [ -z $origin_version ] then origin_version=$python_version export PYTHON=$python continue fi -- 2.20.1.windows.1