mk: simplified command handling

just do includes in mk again. common.sh was stupidly
small, just pointless.

replace the entire command dispatcher with eval, printf
and awk, because i can, and it further reduces sloccount.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-09-13 22:45:27 +01:00
parent dcaa15ab01
commit 5fb0d1098f
3 changed files with 15 additions and 52 deletions
-21
View File
@@ -1,21 +0,0 @@
# SPDX-License-Identifier: GPL-3.0-or-later
. "include/lib.sh"
. "include/env/init.sh"
. "include/env/get.sh"
. "include/fw/vendor.sh"
. "include/fw/mrc.sh"
. "include/fw/inject.sh"
. "include/fw/rom.sh"
. "include/mk/release.sh"
# tree.sh is included from the main mk script
xbcommands=" \
version \
release \
download \
inject \
"
-24
View File
@@ -191,30 +191,6 @@ x_()
"$@" || err "Unhandled error" "x_" "$@"
}
xeq()
{
[ $# -lt 2 ] && \
err "no args" xeq
xbcmd="$1"
chk="$2"
shift 2
case "$chk" in
-*)
return 1
;;
*)
for eq in "$@"; do
[ "$chk" = "$eq" ] && \
return 0; :
done
;;
esac
err "bad command" xeq "$xbcmd" "$chk" "$@"
}
xchk()
{
if [ $# -lt 3 ]; then
+15 -7
View File
@@ -23,18 +23,26 @@ commandv="`readlink -f "$xbarg0" 2>/dev/null`"
cd "${commandv%/*}" || exit 1
. "include/common.sh"
. "include/lib.sh"
. "include/env/init.sh"
. "include/env/get.sh"
if xeq main "${1-}" \
$xbcommands; then
. "include/fw/vendor.sh"
. "include/fw/mrc.sh"
. "include/fw/inject.sh"
. "include/fw/rom.sh"
"$@" || exit 1
exit 0
fi
. "include/mk/release.sh"
_f="${1-}"
shift 1 2>/dev/null || :
eval "$(printf "version release download inject\n" | awk '{ for (i=1; i<=NF; \
i++) $i = "[ \""$i"\" = \"$_f\" ] && x_ "$i" \"$@\" && exit 0;"; print }')"
. "include/mk/tree.sh"
trees "$@" || exit 0
trees "$_f" "$@" || exit 0
x_ touch "$mkhelpercfg"