X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=BaseTools%2FBuildEnv;h=5943bb9ef90890dacddad57cc8877756e16fb316;hp=7c77454bf88bdf106a720400a64f1c8446115a09;hb=cbfdc1b2df65dee011cf33add1dff88de3d9c46d;hpb=094a67398f2e84fb11955ae8f8588647f9bd67cc

diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv
index 7c77454bf8..5943bb9ef9 100755
--- a/BaseTools/BuildEnv
+++ b/BaseTools/BuildEnv
@@ -2,14 +2,9 @@
 # Setup the environment for unix-like systems running a bash-like shell.
 # This file must be "sourced" not merely executed. For example: ". edksetup.sh"
 #
-# Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution.  The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# 
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 
 SetWorkspace() {
@@ -40,8 +35,8 @@ RestorePreviousConfiguration() {
     export CONF_PATH=$WORKSPACE/Conf
     if [ ! -d $WORKSPACE/Conf ] && [ -n "$PACKAGES_PATH" ]
     then
-      PACKAGES_PATH=${PACKAGES_PATH//:/ }
-      for DIR in $PACKAGES_PATH
+      PATH_LIST=${PACKAGES_PATH//:/ }
+      for DIR in $PATH_LIST
       do
         if [ -d $DIR/Conf ]
         then
@@ -89,7 +84,7 @@ StoreCurrentConfiguration() {
   #
   OUTPUT_FILE=$CONF_PATH/BuildEnv.sh
   #echo Storing current configuration into $OUTPUT_FILE
-  echo "# Auto-generated by ${BASH_SOURCE[0]}" > $OUTPUT_FILE
+  echo "# Auto-generated by ${BASH_SOURCE[0]}" >| $OUTPUT_FILE
   GenerateShellCodeToSetVariable WORKSPACE $OUTPUT_FILE
   GenerateShellCodeToSetVariable EDK_TOOLS_PATH $OUTPUT_FILE
   GenerateShellCodeToUpdatePath $OUTPUT_FILE
@@ -137,8 +132,8 @@ SetEdkToolsPath() {
   #
   if [ -n "$PACKAGES_PATH"]
   then
-    PACKAGES_PATH=${PACKAGES_PATH//:/ }
-    for DIR in $PACKAGES_PATH
+    PATH_LIST=${PACKAGES_PATH//:/ }
+    for DIR in $PATH_LIST
     do
       if [ -d $DIR/BaseTools ]
       then
@@ -215,7 +210,7 @@ CopySingleTemplateFile() {
 
   if [ -e $DST_FILENAME ]
   then
-    return
+    [ $RECONFIG != TRUE ] && return
   fi
 
   echo "Copying \$EDK_TOOLS_PATH/$SRC_FILENAME"