Avoid printing %PATH% twice: move the printing of the environment down
to print_python_info.
Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
---
BaseTools/toolsetup.bat | 35 +++++++++-----------
1 file changed, 16 insertions(+), 19 deletions(-)
diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 80aa2992ba80..6edfa3074f80 100755
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -268,24 +268,6 @@ if NOT exist %CONF_PATH%\build_rule.txt (
if defined RECONFIG copy /Y %EDK_TOOLS_PATH%\Conf\build_rule.template %CONF_PATH%\build_rule.txt > nul
)
-echo PATH = %PATH%
-echo.
-if defined WORKSPACE (
- echo WORKSPACE = %WORKSPACE%
-)
-if defined PACKAGES_PATH (
- echo PACKAGES_PATH = %PACKAGES_PATH%
-)
-echo EDK_TOOLS_PATH = %EDK_TOOLS_PATH%
-if defined BASE_TOOLS_PATH (
- echo BASE_TOOLS_PATH = %BASE_TOOLS_PATH%
-)
-if defined EDK_TOOLS_BIN (
- echo EDK_TOOLS_BIN = %EDK_TOOLS_BIN%
-)
-echo CONF_PATH = %CONF_PATH%
-echo.
-
:skip_reconfig
@REM
@@ -399,7 +381,22 @@ if %ERRORLEVEL% EQU 0 (
goto print_python_info
:print_python_info
- echo PATH = %PATH%
+ echo PATH = %PATH%
+ echo.
+ if defined WORKSPACE (
+ echo WORKSPACE = %WORKSPACE%
+ )
+ if defined PACKAGES_PATH (
+ echo PACKAGES_PATH = %PACKAGES_PATH%
+ )
+ echo EDK_TOOLS_PATH = %EDK_TOOLS_PATH%
+ if defined BASE_TOOLS_PATH (
+ echo BASE_TOOLS_PATH = %BASE_TOOLS_PATH%
+ )
+ if defined EDK_TOOLS_BIN (
+ echo EDK_TOOLS_BIN = %EDK_TOOLS_BIN%
+ )
+ echo CONF_PATH = %CONF_PATH%
echo PYTHON_COMMAND = %PYTHON_COMMAND%
echo PYTHONPATH = %PYTHONPATH%
echo.
--
2.40.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#103593): https://edk2.groups.io/g/devel/message/103593
Mute This Topic: https://groups.io/mt/98497589/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-