diff options
| author | Leah Rowe <leah@libreboot.org> | 2025-05-07 15:12:10 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2025-05-07 15:12:10 +0100 |
| commit | ec5c954337b2e1ea50b0ace0f1086e48f20e7774 (patch) | |
| tree | 8565e32928942000de3b89af4f9b79c057592316 /include | |
| parent | 1390f7f800767dcba394ebbc4f7996508940639e (diff) | |
lib.sh: Simplified fx_() and removed fe_()
Instead of calling fe_, prefix x_ as indicated.
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/inject.sh | 14 | ||||
| -rw-r--r-- | include/lib.sh | 14 | ||||
| -rw-r--r-- | include/rom.sh | 2 |
3 files changed, 10 insertions, 20 deletions
diff --git a/include/inject.sh b/include/inject.sh index f1e29fd6..dc4868ed 100644 --- a/include/inject.sh +++ b/include/inject.sh @@ -49,7 +49,7 @@ download() readkconfig() { x_ rm -f "$xbmktmp/cbcfg" - fe_ scankconfig find "$boarddir/config" -type f + fx_ scankconfig x_ find "$boarddir/config" -type f eval "`setcfg "$xbmktmp/cbcfg" 1`" @@ -148,7 +148,7 @@ extract_intel_me() chkvars ME11delta ME11version ME11sku ME11pch [ "$ME11bootguard" = "y" ] && x_ ./mk -f deguard - set +u +e && fe_ find_me find "$xbmkpwd/$appdir" -type f + set +u +e && fx_ find_me x_ find "$xbmkpwd/$appdir" -type f [ "$ME11bootguard" != "y" ] && x_ mv "$_metmp" "$_me" && return 0 ( x_ cd src/deguard/ @@ -169,7 +169,7 @@ find_me() "$mecleaner" $mfs $_r -t -O "$_metmp" "$1" || "$me7updateparser" \ -O "$_metmp" "$1" || extract_archive "$1" "$_7ztest" || return 0 - fe_ find_me find "$_7ztest" -type f || return 1; : + fx_ find_me x_ find "$_7ztest" -type f || return 1; : } extract_archive() @@ -228,7 +228,8 @@ extract_sch5545ec() # https://pcsupport.lenovo.com/us/en/products/laptops-and-netbooks/thinkpad-t-series-laptops/thinkpad-t480-type-20l5-20l6/20l5/solutions/ht508988 extract_tbfw() { - chkvars TBFW_size; fe_ copy_tbfw find "$appdir" -type f -name "TBT.bin" + chkvars TBFW_size + fx_ copy_tbfw x_ find "$appdir" -type f -name "TBT.bin" } copy_tbfw() @@ -344,7 +345,8 @@ patch_release_roms() done if readkconfig; then - fe_ preprom find "$tmpromdir" -maxdepth 1 -type f -name "*.rom" + fx_ preprom x_ find "$tmpromdir" -maxdepth 1 -type f \ + -name "*.rom" [ "$nukemode" != "nuke" ] || \ printf "Make sure you inserted vendor files: %s\n" \ "$vguide" > "$tmpromdir/README.md" || : @@ -492,7 +494,7 @@ modify_mac() [ -n "$new_mac" ] && [ "$new_mac" != "restore" ] && \ x_ "$nvm" "$xbmklocal/gbe" setmac "$new_mac" - fe_ newmac find "$tmpromdir" -maxdepth 1 -type f -name "*.rom" + fx_ newmac x_ find "$tmpromdir" -maxdepth 1 -type f -name "*.rom" printf "\nGbE NVM written to '%s':\n" "$archive" x_ "$nvm" "$xbmklocal/gbe" dump | grep -v "bytes read from file" || : diff --git a/include/lib.sh b/include/lib.sh index f20b17e9..274daf69 100644 --- a/include/lib.sh +++ b/include/lib.sh @@ -144,23 +144,11 @@ singletree() return 1 } -fe_() -{ - find_ex "x_" "$@" -} - fx_() { - find_ex "" "$@" -} - -find_ex() -{ - xmsg="$1" && shift 1 fd="`mktemp`" && x_ rm -f "$fd" && x_ touch "$fd" xx="$1" && shift 1 - $xmsg "$@" 2>/dev/null | sort 1>"$fd" 2>/dev/null || \ - err "!find $(echo "$@") > \"$fd\"" + "$@" 2>/dev/null | sort 1>"$fd" 2>/dev/null || err "FATAL: !sort fx_" dx_ "$xx" "$fd" || break x_ rm -f "$fd" } diff --git a/include/rom.sh b/include/rom.sh index cb3c1298..fdd0787f 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -183,7 +183,7 @@ mkseagrub() [ "$payload_grubsea" = "y" ] && pname="grub" [ "$payload_grubsea" = "y" ] || \ cbfs "$tmprom" "$grubdata/bootorder" bootorder raw - fe_ cprom find "$grubdata/keymap" -type f -name "*.gkb" + fx_ cprom x_ find "$grubdata/keymap" -type f -name "*.gkb" } add_uboot() |