coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-14 07:19:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

lib.sh: Simplified fx_() and removed fe_()

Browse Source 
Instead of calling fe_, prefix x_ as indicated.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2025-05-07 15:12:10 +01:00
parent 1390f7f800
commit ec5c954337
6 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/inject.sh
+8 -6
View File
@@ -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" || :