]> git.proxmox.com Git - mirror_edk2.git/commitdiff
BaseTools: Fix the ending character for Linux script BuildEnv
authorBob Feng <bob.c.feng@intel.com>
Tue, 9 Feb 2021 14:58:08 +0000 (06:58 -0800)
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Wed, 10 Feb 2021 01:48:50 +0000 (01:48 +0000)
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Cc: Matthew Carlson <matthewfcarlson@gmail.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Reviewed-by: Leif Lindholm <leif@nuviainc.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
BaseTools/BuildEnv

index 8d283e10c01518022c4704d93432a6c40e181c9f..275f4c5901aa59b4726dc1ff57ff0b47ada05d1b 100755 (executable)
@@ -46,7 +46,7 @@ RestorePreviousConfiguration() {
       done
     fi
   fi
-\r
+
   PREVIOUS_CONF_FILE=$CONF_PATH/BuildEnv.sh
   if [ -e $PREVIOUS_CONF_FILE ]
   then
@@ -198,17 +198,17 @@ AddEdkToolsToPath() {
 
   EDK_TOOLS_PATH_BIN=`GetEdkToolsPathBinDirectory`
 
-  # check if the edk2basetools pip package is available\r
-  if $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then\r
-    # if it is, use the pip version of the wrappers\r
-    echo "Using Pip Basetools"\r
-    AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike\r
-  else\r
-    echo "Using EDK2 in-source Basetools"\r
-    AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike\r
-  fi\r
-\r
-\r
+  # check if the edk2basetools pip package is available
+  if $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then
+    # if it is, use the pip version of the wrappers
+    echo "Using Pip Basetools"
+    AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike
+  else
+    echo "Using EDK2 in-source Basetools"
+    AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike
+  fi
+
+
   AddDirToStartOfPath $EDK_TOOLS_PATH_BIN
 
 }