ShellPkg: add array index check for shell delay option

[mirror_edk2.git] / edksetup.sh

diff --git a/edksetup.sh b/edksetup.sh
index d4e577e607811fa90f712c8e691a70c6218f13ee..a8897d10f80d28144155033ea3e0dbd7e30349e0 100755 (executable)
--- a/edksetup.sh
+++ b/edksetup.sh
@@ -77,7 +77,7 @@ function SetWorkspace()
   # Set $WORKSPACE
   #
   export WORKSPACE=`pwd`
-
+  export PYTHONHASHSEED=1
   return 0
 }
 
@@ -90,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
@@ -113,39 +113,81 @@ function SetupEnv()
 
 function SetupPython3()
 {
-  for python in $(whereis python3)
-  do
-    python=$(echo $python | grep "[[:digit:]]$" || true)
-    python_version=${python##*python}
-    if [ -z "${python_version}" ];then
-      continue
+  if [ $origin_version ];then
+      origin_version=
     fi
-    if [ -z $origin_version ];then
-      origin_version=$python_version
-      export PYTHON3=$python
-      continue
+    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
-    ret=`echo "$origin_version < $python_version" |bc`
-    if [ "$ret" -eq 1 ]; then
-      origin_version=$python_version
-      export PYTHON3=$python
+  fi
+
+  if [ $PYTHON3_ENABLE ] && [ $PYTHON3_ENABLE == TRUE ]
+  then
+    SetupPython3
+  fi
+
+  if [ $PYTHON3_ENABLE ] && [ $PYTHON3_ENABLE != TRUE ]
+  then
+    if [ $origin_version ];then
+      origin_version=
     fi
-  done
-  if [ -z "$origin_version" ] || [ `echo "$origin_version < 3.6" |bc` -eq 1 ]; then
-    echo
-    echo ERROR!!!, python version should greater than or equal to version 3.6.
-    echo 
-    return 1
+    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
-  SetupPython3
+  SetupPython
 }
 
 I=$#