Merged.

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Bob Feng
Sent: Friday, June 25, 2021 9:54 AM
To: Rebecca Cran <rebe...@bsdio.com>; Liming Gao <gaolim...@byosoft.com.cn>; 
Chen, Christine <yuwei.c...@intel.com>
Cc: devel@edk2.groups.io
Subject: Re: [edk2-devel] [PATCH] BaseTools: Fix spelling of "overwrite" and 
"overwriting" in toolset.bat

Reviewed-by: Bob Feng <bob.c.f...@intel.com>

-----Original Message-----
From: Rebecca Cran <rebe...@bsdio.com> 
Sent: Sunday, June 13, 2021 11:56 AM
To: Feng, Bob C <bob.c.f...@intel.com>; Liming Gao <gaolim...@byosoft.com.cn>; 
Chen, Christine <yuwei.c...@intel.com>
Cc: Rebecca Cran <rebe...@bsdio.com>; devel@edk2.groups.io
Subject: [PATCH] BaseTools: Fix spelling of "overwrite" and "overwriting" in 
toolset.bat

The words "overwrite" and "overwriting" are one word and shouldn't have hyphens.

Signed-off-by: Rebecca Cran <rebe...@bsdio.com>
---
 BaseTools/toolsetup.bat | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat index 
4b5256ab6e..1fb44aaeff 100755
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -227,7 +227,7 @@ if NOT exist %CONF_PATH% (
 ) else (   if defined RECONFIG (     echo.-    echo  Over-writing the files in 
the CONF_PATH directory+    echo  Overwriting the files in the CONF_PATH 
directory     echo  using the default template files     echo.   )@@ -240,7 
+240,7 @@ if NOT exist %CONF_PATH%\target.txt (
   )   copy %EDK_TOOLS_PATH%\Conf\target.template %CONF_PATH%\target.txt > nul 
) else (-  if defined RECONFIG echo over-write ... target.template to 
%CONF_PATH%\target.txt+  if defined RECONFIG echo overwrite ... target.template 
to %CONF_PATH%\target.txt   if defined RECONFIG copy /Y 
%EDK_TOOLS_PATH%\Conf\target.template %CONF_PATH%\target.txt > nul ) @@ -251,7 
+251,7 @@ if NOT exist %CONF_PATH%\tools_def.txt (
   )   copy %EDK_TOOLS_PATH%\Conf\tools_def.template %CONF_PATH%\tools_def.txt 
> nul ) else (-  if defined RECONFIG echo over-write ... tools_def.template to 
%CONF_PATH%\tools_def.txt+  if defined RECONFIG echo overwrite ... 
tools_def.template to %CONF_PATH%\tools_def.txt   if defined RECONFIG copy /Y 
%EDK_TOOLS_PATH%\Conf\tools_def.template %CONF_PATH%\tools_def.txt > nul ) -- 
2.32.0









-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#77081): https://edk2.groups.io/g/devel/message/77081
Mute This Topic: https://groups.io/mt/83503170/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-


Reply via email to