X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=BaseTools%2FBuildEnv;h=83e12d769857431df7ba01a893f859d5a85b6685;hb=5c526736370b475e85c59fafe3900101a95e93d3;hp=8e7343a73b749e5e62578cd4e89c5f96ef380b66;hpb=66dcb2f08a49419bd5857459fbd3de7b983b6605;p=mirror_edk2.git

diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv
old mode 100644
new mode 100755
index 8e7343a73b..83e12d7698
--- a/BaseTools/BuildEnv
+++ b/BaseTools/BuildEnv
@@ -44,7 +44,7 @@ RestorePreviousConfiguration() {
   #
   # Restore previous configuration
   #
-  PREVIOUS_CONF_FILE=Conf/BuildEnv.sh2
+  PREVIOUS_CONF_FILE=Conf/BuildEnv.sh
   if [ -e $PREVIOUS_CONF_FILE ]
   then
     echo Loading previous configuration from \$WORKSPACE/$PREVIOUS_CONF_FILE
@@ -79,7 +79,7 @@ StoreCurrentConfiguration() {
   # Write configuration to a shell script to allow for configuration to be
   # easily reloaded.
   #
-  OUTPUT_FILE=Conf/BuildEnv.sh2
+  OUTPUT_FILE=Conf/BuildEnv.sh
   #echo Storing current configuration into \$WORKSPACE/$OUTPUT_FILE
   OUTPUT_FILE=$WORKSPACE/$OUTPUT_FILE
   echo "# Auto-generated by ${BASH_SOURCE[0]}" > $OUTPUT_FILE
@@ -157,9 +157,9 @@ GetEdkToolsPathBinDirectory() {
   #
   BIN_SUB_DIR=`GetBaseToolsBinSubDir`
 
-  if [ -e $EDK_TOOLS_PATH/PseudoBin/$BIN_SUB_DIR ]
+  if [ -e $EDK_TOOLS_PATH/BinWrappers/$BIN_SUB_DIR ]
   then
-    EDK_TOOLS_PATH_BIN=$EDK_TOOLS_PATH/PseudoBin/$BIN_SUB_DIR
+    EDK_TOOLS_PATH_BIN=$EDK_TOOLS_PATH/BinWrappers/$BIN_SUB_DIR
   else
     EDK_TOOLS_PATH_BIN=$EDK_TOOLS_PATH/Bin/$BIN_SUB_DIR
   fi