BaseTools/Capsule: Do not support -o with --dump-info

[mirror_edk2.git] / BaseTools / BuildEnv

diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv
index cb6403a52ba60bbc234f539da277d0bb78436d52..ff0c5115a5e18a074705bbd58c273ab2dd98066b 100755 (executable)
--- a/BaseTools/BuildEnv
+++ b/BaseTools/BuildEnv
@@ -2,7 +2,7 @@
 # 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>
+# Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
 # Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions of the BSD License
@@ -41,8 +41,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
@@ -90,7 +90,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
@@ -138,8 +138,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