From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.groups.io with SMTP id smtpd.web11.11391.1612882882967110232 for ; Tue, 09 Feb 2021 07:01:23 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=Pa+UjHph; spf=pass (domain: nuviainc.com, ip: 209.85.221.46, mailfrom: leif@nuviainc.com) Received: by mail-wr1-f46.google.com with SMTP id h12so5999425wrw.6 for ; Tue, 09 Feb 2021 07:01:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=eSiFy3PQbdFwByY9KxTeEg4qWPmBcqSy2zs657uf74k=; b=Pa+UjHphQRUU1lyBkywz8KuStuJmEUMMOrz/AIJSNHxfALvzIQXSajFoZB41QWEL50 yYpq/ktCNCsyVxYyJFgLfYevSroenFFz8BRnjqbdHO8jaNpuj8uA13i4qAiOFuppPR0u 6NxSZTP6V958XogLAmEx0lt0TxgQJQO2kvQMXmQsf0jRTalEy2S6B2Ri9ZQoQt82tJRQ mlBJVbRKPLLcNREiUbKbZ0k0D1svgQ50CGl/4LK6O7PaIxpdMsX1jgLD1XbQMkKJO7j/ Ff2xYn+sY3AgmRQP3RxeVk/JQ7yF8x6FMez6GdVmvTCtDidbCPEStGduf3ua2GouBfhk yCCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=eSiFy3PQbdFwByY9KxTeEg4qWPmBcqSy2zs657uf74k=; b=uVN6OVY2fzg7YD0ikCil8i+T1YKkiE9QfuI08hw36Sr89pKNv7chcQ12fMq1hp6STC nn6GaDIj1Rf/SU9k8Ld6378WvWBuWHIdfzbVNjpy3gy2sh7F3iitlk2DKoMHGuvUuKRQ HPlu9/vh6vFFj6TgKRawef2p3LKnwSPh3NxpP+ZRJoZjfK+0tnx9RpmQWLIwVmiGYxpV 7uAJX+V1ZjHw8M6CDNt+HhVz62z/owrYMxYghNVnZ9dAfi8yWBHPft7mQT5yhctSeT+X s0Ktv8E2SNKYuYnTadgrvba3lyIXl41OywOgiwvnMeQ9zI0ctFqAG6VYCdhwesZam88d b3Uw== X-Gm-Message-State: AOAM532ucOyJ/oTJ1M9rNCwT4fvVulcgcdLqiz3c6yCxHfRLMdZQPTqA 7+jNTrcQcvXqeASwOx0w51jJ7A== X-Google-Smtp-Source: ABdhPJw+MjqKJEjSgFDrwciC5bkmdbh945XO20FLF/rSI9os5YLepkd3cs7hajrPavYiTubb2JKqXw== X-Received: by 2002:a05:6000:4e:: with SMTP id k14mr6776951wrx.281.1612882881598; Tue, 09 Feb 2021 07:01:21 -0800 (PST) Return-Path: Received: from vanye (cpc1-cmbg19-2-0-cust915.5-4.cable.virginm.net. [82.27.183.148]) by smtp.gmail.com with ESMTPSA id t6sm4828863wmj.22.2021.02.09.07.01.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Feb 2021 07:01:20 -0800 (PST) Date: Tue, 9 Feb 2021 15:01:18 +0000 From: "Leif Lindholm" To: Bob Feng Cc: devel@edk2.groups.io, Liming Gao , Yuwei Chen , Matthew Carlson , Michael D Kinney Subject: Re: [Patch] BaseTools: Fix the ending character for Linux script BuildEnv Message-ID: <20210209150118.GJ1664@vanye> References: <20210209145808.451-1-bob.c.feng@intel.com> MIME-Version: 1.0 In-Reply-To: <20210209145808.451-1-bob.c.feng@intel.com> User-Agent: Mutt/1.10.1 (2018-07-13) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Feb 09, 2021 at 22:58:08 +0800, Bob Feng wrote: > Signed-off-by: Bob Feng > Cc: Liming Gao > Cc: Yuwei Chen > Cc: Matthew Carlson > Cc: Michael D Kinney > Cc: Leif Lindholm SMTP strips the intersting aspect, but as long as the end result is a BuildEnv that has no characters: Reviewed-by: 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 > - > + > PREVIOUS_CONF_FILE=$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 > > EDK_TOOLS_PATH_BIN=`GetEdkToolsPathBinDirectory` > > - # 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 > - > - > + # 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 > > } > > CopySingleTemplateFile() { > -- > 2.29.1.windows.1 >