From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web08.11338.1612882695108137712 for ; Tue, 09 Feb 2021 06:58:15 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: bob.c.feng@intel.com) IronPort-SDR: v/iEhgwIgpCRlWJb0SEhnpxWvT70+qYwHlTisU+KJqgKwHsLGYGC5P0V/6uul6K1QxNwJDqQ0t e7brqwEidzlA== X-IronPort-AV: E=McAfee;i="6000,8403,9889"; a="266725500" X-IronPort-AV: E=Sophos;i="5.81,165,1610438400"; d="scan'208";a="266725500" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Feb 2021 06:58:14 -0800 IronPort-SDR: iWyA98MlxX5FCBE/owpajD6QuHiAFvGqT5khU04eNW+NOqHJk+TGq7qSz/8FYgsWGuueovhbcu Fz1Gl5cI1lgw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,165,1610438400"; d="scan'208";a="396148195" Received: from shwdepsi1121.ccr.corp.intel.com ([10.239.158.32]) by orsmga008.jf.intel.com with ESMTP; 09 Feb 2021 06:58:11 -0800 From: "Bob Feng" To: devel@edk2.groups.io Cc: Liming Gao , Yuwei Chen , Matthew Carlson , Michael D Kinney , Leif Lindholm Subject: [Patch] BaseTools: Fix the ending character for Linux script BuildEnv Date: Tue, 9 Feb 2021 22:58:08 +0800 Message-Id: <20210209145808.451-1-bob.c.feng@intel.com> X-Mailer: git-send-email 2.29.1.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Signed-off-by: Bob Feng Cc: Liming Gao Cc: Yuwei Chen Cc: Matthew Carlson Cc: Michael D Kinney =0D Cc: Leif Lindholm --- BaseTools/BuildEnv | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv index 8d283e10c0..275f4c5901 100755 --- a/BaseTools/BuildEnv +++ b/BaseTools/BuildEnv @@ -44,11 +44,11 @@ RestorePreviousConfiguration() { break fi done fi fi -=0D + PREVIOUS_CONF_FILE=3D$CONF_PATH/BuildEnv.sh if [ -e $PREVIOUS_CONF_FILE ] then echo Loading previous configuration from $PREVIOUS_CONF_FILE . $PREVIOUS_CONF_FILE @@ -196,21 +196,21 @@ AddEdkToolsToPath() { return 1 fi =20 EDK_TOOLS_PATH_BIN=3D`GetEdkToolsPathBinDirectory` =20 - # check if the edk2basetools pip package is available=0D - if $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then=0D - # if it is, use the pip version of the wrappers=0D - echo "Using Pip Basetools"=0D - AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike=0D - else=0D - echo "Using EDK2 in-source Basetools"=0D - AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike=0D - fi=0D -=0D -=0D + # check if the edk2basetools pip package is available + if $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then + # if it is, use the pip version of the wrappers + echo "Using Pip Basetools" + AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike + else + echo "Using EDK2 in-source Basetools" + AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike + fi + + AddDirToStartOfPath $EDK_TOOLS_PATH_BIN =20 } =20 CopySingleTemplateFile() { --=20 2.29.1.windows.1