BaseTools: only print the environment once in toolsetup.bat

Avoid printing %PATH% twice: move the printing of the environment down
to print_python_info.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>

diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 85104aa224da43f5ca68c53de42f3f0080990e30..9521f67c024e2f4f07e3dee324bae9fa03cf281f 100755 (executable)
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -250,24 +250,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\r
 )\r
 \r
-echo           PATH      = %PATH%\r
-echo.\r
-if defined WORKSPACE (\r
-  echo      WORKSPACE      = %WORKSPACE%\r
-)\r
-if defined PACKAGES_PATH (\r
-  echo  PACKAGES_PATH      = %PACKAGES_PATH%\r
-)\r
-echo EDK_TOOLS_PATH      = %EDK_TOOLS_PATH%\r
-if defined BASE_TOOLS_PATH (\r
-  echo BASE_TOOLS_PATH     = %BASE_TOOLS_PATH%\r
-)\r
-if defined EDK_TOOLS_BIN (\r
-  echo  EDK_TOOLS_BIN      = %EDK_TOOLS_BIN%\r
-)\r
-echo      CONF_PATH      = %CONF_PATH%\r
-echo.\r
-\r
 :skip_reconfig\r
 \r
 @REM\r
@@ -381,7 +363,22 @@ if %ERRORLEVEL% EQU 0 (
   goto print_python_info\r
 \r
 :print_python_info\r
-  echo                PATH = %PATH%\r
+  echo           PATH      = %PATH%\r
+  echo.\r
+  if defined WORKSPACE (\r
+    echo      WORKSPACE      = %WORKSPACE%\r
+  )\r
+  if defined PACKAGES_PATH (\r
+    echo  PACKAGES_PATH      = %PACKAGES_PATH%\r
+  )\r
+  echo EDK_TOOLS_PATH      = %EDK_TOOLS_PATH%\r
+  if defined BASE_TOOLS_PATH (\r
+    echo BASE_TOOLS_PATH     = %BASE_TOOLS_PATH%\r
+  )\r
+  if defined EDK_TOOLS_BIN (\r
+    echo  EDK_TOOLS_BIN      = %EDK_TOOLS_BIN%\r
+  )\r
+  echo      CONF_PATH      = %CONF_PATH%\r
   echo      PYTHON_COMMAND = %PYTHON_COMMAND%\r
   echo          PYTHONPATH = %PYTHONPATH%\r
   echo.\r