coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-09-20 05:30:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

xbmk: re-introduce condensed if statements

Browse Source 
i've been careful to makely only use it on AND operations,
not onse that use OR. a lot of blocks are not condensed,
unlike previously when this design was used.

i removed the condensed design because it made the code
allegedly easier to read, but i found it harder to read
and found the code looked dirty. this change makes it
clean again, but i've done it in a way where the shorthand
conditional statements are easy to understand for most
people. this strikes a compromise; i would go further.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-09-11 14:41:18 +01:00
parent 8173aea83b
commit 15204cda63
9 changed files with 292 additions and 557 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/inject.sh
+11 -20
View File
@@ -18,9 +18,8 @@ inject()
{
remkdir "$tmpromdel"
if [ $# -lt 1 ]; then
[ $# -lt 1 ] && \
err "No options specified" "inject" "$@"
fi
archive="$1";
new_mac="xx:xx:xx:xx:xx:xx"
@@ -36,18 +35,16 @@ inject()
setmac)
if [ $# -gt 2 ]; then
new_mac="$3" && \
if [ -z "$new_mac" ]; then
err "Empty MAC address specified" "inject" "$@"
fi
[ -z "$new_mac" ] && \
err "Empty MAC address" "inject" "$@"; :
fi
;;
*)
err "Unrecognised inject mode: '$2'" "inject" "$@" ;;
esac
if [ "$new_mac" = "keep" ]; then
[ "$new_mac" = "keep" ] && \
new_mac=""
fi
check_release
if check_target; then
@@ -55,9 +52,8 @@ inject()
return 0
fi
fi
if [ "$xchanged" = "y" ]; then
[ "$xchanged" = "y" ] && \
remktar
fi
if [ "$xchanged" = "y" ]; then
printf "\n'%s' was modified\n" "$archive" 1>&2
@@ -70,9 +66,8 @@ inject()
check_release()
{
if [ -L "$archive" ]; then
[ -L "$archive" ] && \
err "'$archive' is a symlink" "check_release" "$@"
fi
if e "$archive" f missing; then
err "'$archive' missing" "check_release" "$@"
fi
@@ -80,9 +75,8 @@ check_release()
archivename="`basename "$archive" || err "Can't get '$archive' name"`" \
|| err "can't get '$archive' name" "check_release" "$@"
if [ -z "$archivename" ]; then
[ -z "$archivename" ] && \
err "Can't determine archive name" "check_release" "$@"
fi
case "$archivename" in
*_src.tar.xz)
@@ -102,9 +96,8 @@ check_release()
check_target()
{
if [ "$board" != "${board#serprog_}" ]; then
[ "$board" != "${board#serprog_}" ] && \
return 1
fi
boarddir="$cbcfgsdir/$board"
@@ -119,16 +112,14 @@ check_target()
ifdtool="elf/coreboot/$tree/ifdtool"
if [ -n "$IFD_platform" ]; then
ifdprefix="-p $IFD_platform"
fi
[ -n "$IFD_platform" ] && \
ifdprefix="-p $IFD_platform"; :
}
patch_release()
{
if [ "$nuke" != "nuke" ]; then
[ "$nuke" != "nuke" ] && \
x_ ./mk download "$board"
fi
has_hashes="n"
tmpromdir="$tmpromdel/bin/$board"