ShellPkg: add array index check for shell delay option

[mirror_edk2.git] / edksetup.sh

diff --git a/edksetup.sh b/edksetup.sh
index 7b542230f22b0c2b7114f1e12601029be76b50eb..a8897d10f80d28144155033ea3e0dbd7e30349e0 100755 (executable)
--- a/edksetup.sh
+++ b/edksetup.sh
@@ -24,6 +24,7 @@
 #
 
 SCRIPTNAME="edksetup.sh"
+RECONFIG=FALSE
 
 function HelpMsg()
 {
@@ -35,6 +36,9 @@ function HelpMsg()
   echo "Options: "
   echo "  --help, -h, -?        Print this help screen and exit."
   echo
+  echo "  --reconfig            Overwrite the WORKSPACE/Conf/*.txt files with the"
+  echo "                        template files from the BaseTools/Conf directory."
+  echo
   echo Please note: This script must be \'sourced\' so the environment can be changed.
   echo ". $SCRIPTNAME"
   echo "source $SCRIPTNAME"
@@ -50,7 +54,7 @@ function SetWorkspace()
     return 0
   fi
 
-  if [ ! ${BASH_SOURCE[0]} -ef ./edksetup.sh ]
+  if [ ! ${BASH_SOURCE[0]} -ef ./edksetup.sh ] && [ -z "$PACKAGES_PATH" ]
   then
     echo Run this script from the base of your tree.  For example:
     echo "  cd /Path/To/Edk/Root"
@@ -73,7 +77,7 @@ function SetWorkspace()
   # Set $WORKSPACE
   #
   export WORKSPACE=`pwd`
-
+  export PYTHONHASHSEED=1
   return 0
 }
 
@@ -86,7 +90,7 @@ function SetupEnv()
   then
     . $WORKSPACE/BaseTools/BuildEnv
   elif [ -n "$PACKAGES_PATH" ]
-  then 
+  then
     PATH_LIST=$PACKAGES_PATH
     PATH_LIST=${PATH_LIST//:/ }
     for DIR in $PATH_LIST
@@ -107,10 +111,83 @@ function SetupEnv()
   fi
 }
 
+function SetupPython3()
+{
+  if [ $origin_version ];then
+      origin_version=
+    fi
+    for python in $(whereis python3)
+    do
+      python=$(echo $python | grep "[[:digit:]]$" || true)
+      python_version=${python##*python}
+      if [ -z "${python_version}" ] || (! command -v $python >/dev/null 2>&1);then
+        continue
+      fi
+      if [ -z $origin_version ];then
+        origin_version=$python_version
+        export PYTHON_COMMAND=$python
+        continue
+      fi
+      ret=`echo "$origin_version < $python_version" |bc`
+      if [ "$ret" -eq 1 ]; then
+        origin_version=$python_version
+        export PYTHON_COMMAND=$python
+      fi
+    done
+    return 0
+}
+
+function SetupPython()
+{
+  if [ $PYTHON_COMMAND ] && [ -z $PYTHON3_ENABLE ];then
+    if ( command -v $PYTHON_COMMAND >/dev/null 2>&1 );then
+      return 0
+    else
+      echo $PYTHON_COMMAND Cannot be used to build or execute the python tools.
+      return 1
+    fi
+  fi
+
+  if [ $PYTHON3_ENABLE ] && [ $PYTHON3_ENABLE == TRUE ]
+  then
+    SetupPython3
+  fi
+
+  if [ $PYTHON3_ENABLE ] && [ $PYTHON3_ENABLE != TRUE ]
+  then
+    if [ $origin_version ];then
+      origin_version=
+    fi
+    for python in $(whereis python2)
+    do
+      python=$(echo $python | grep "[[:digit:]]$" || true)
+      python_version=${python##*python}
+      if [ -z "${python_version}" ] || (! command -v $python >/dev/null 2>&1);then
+        continue
+      fi
+      if [ -z $origin_version ]
+      then
+        origin_version=$python_version
+        export PYTHON_COMMAND=$python
+        continue
+      fi
+      ret=`echo "$origin_version < $python_version" |bc`
+      if [ "$ret" -eq 1 ]; then
+        origin_version=$python_version
+        export PYTHON_COMMAND=$python
+      fi
+    done
+    return 0
+  fi
+
+  SetupPython3
+}
+
 function SourceEnv()
 {
   SetWorkspace &&
   SetupEnv
+  SetupPython
 }
 
 I=$#
@@ -121,6 +198,10 @@ do
       # Ignore argument for backwards compatibility
       shift
     ;;
+    --reconfig)
+      RECONFIG=TRUE
+      shift
+    ;;
     -?|-h|--help|*)
       HelpMsg
       break
@@ -136,4 +217,6 @@ fi
 
 SourceEnv
 
+unset SCRIPTNAME RECONFIG
+
 return $?