sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove bashisms from edksetup.sh and BaseTools/BuildEnv

Browse Source 
Remove bashisms from edksetup.sh and BaseTools/BuildEnv. This allows any
POSIX shell to use those scripts, removing the dependency on bash.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
This commit is contained in:
Rebecca Cran
2023-04-24 14:59:14 -06:00
committed by mergify[bot]
parent 373a95532a
commit e6447d2a08
2 changed files with 26 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
edksetup.sh
View File

@@ -20,7 +20,7 @@
SCRIPTNAME="edksetup.sh"
RECONFIG=FALSE
function HelpMsg()
HelpMsg()
{
echo "Usage: $SCRIPTNAME [Options]"
echo
@@ -38,7 +38,7 @@ function HelpMsg()
echo "source $SCRIPTNAME"
}
function SetWorkspace()
SetWorkspace()
{
#
# If WORKSPACE is already set, then we can return right now
@@ -49,10 +49,10 @@ function SetWorkspace()
return 0
fi
if [ ! ${BASH_SOURCE[0]} -ef ./$SCRIPTNAME ] && [ -z "$PACKAGES_PATH" ]
if [ ! -f ${SCRIPTNAME} ] && [ -z "$PACKAGES_PATH" ]
then
echo Run this script from the base of your tree. For example:
echo " cd /Path/To/Edk/Root"
echo Source this script from the base of your tree. For example:
echo " cd /Path/To/Edk2/Clone"
echo " . $SCRIPTNAME"
return 1
fi
@@ -75,7 +75,7 @@ function SetWorkspace()
return 0
}
function SetupEnv()
SetupEnv()
{
if [ -n "$EDK_TOOLS_PATH" ]
then
@@ -85,9 +85,7 @@ function SetupEnv()
. $WORKSPACE/BaseTools/BuildEnv
elif [ -n "$PACKAGES_PATH" ]
then
PATH_LIST=$PACKAGES_PATH
PATH_LIST=${PATH_LIST//:/ }
for DIR in $PATH_LIST
for DIR in $(echo $PACKAGES_PATH | tr ':' ' ')
do
if [ -f "$DIR/BaseTools/BuildEnv" ]
then
@@ -105,81 +103,16 @@ function SetupEnv()
fi
}
function SetupPython3()
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
if [[ "$origin_version" < "$python_version" ]]; then
origin_version=$python_version
export PYTHON_COMMAND=$python
fi
done
return 0
export PYTHON_COMMAND=python3
}
function SetupPython()
SourceEnv()
{
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
if [[ "$origin_version" < "$python_version" ]]; then
origin_version=$python_version
export PYTHON_COMMAND=$python
fi
done
return 0
fi
SetupPython3
}
function SourceEnv()
{
SetWorkspace &&
SetWorkspace
SetupEnv
SetupPython
}
I=$#