diff options
| author | Leah Rowe <leah@libreboot.org> | 2025-05-07 10:20:59 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2025-05-07 10:20:59 +0100 |
| commit | 2b7f6b7d7cedfcc7661f02b8092707fde09460a0 (patch) | |
| tree | fe3a4d5bf820fc034afd376f1a472784c8e63406 | |
| parent | 485d785d3313fb5c27b0822f8c8e25d631efb3d6 (diff) | |
inject.sh: Simplify extract_intel_me_bruteforce()
This is probably about as small as it's going to get.
Signed-off-by: Leah Rowe <leah@libreboot.org>
| -rw-r--r-- | include/inject.sh | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/include/inject.sh b/include/inject.sh index a26668b5..c1e8131c 100644 --- a/include/inject.sh +++ b/include/inject.sh @@ -148,14 +148,10 @@ extract_intel_me() chkvars ME11delta ME11version ME11sku ME11pch [ "$ME11bootguard" = "y" ] && x_ ./mk -f deguard - set +u +e - fe_ extract_intel_me_bruteforce "$xbmkpwd/$appdir" -type f || : - x_ rm -Rf "$xbmklocal/metmp" - + set +u +e && fe_ extract_intel_me_bruteforce "$xbmkpwd/$appdir" -type f [ "$ME11bootguard" != "y" ] && x_ mv "$_metmp" "$_me" && return 0 - ( - x_ cd src/deguard/ + ( x_ cd src/deguard/ x_ ./finalimage.py --delta "data/delta/$ME11delta" --version \ "$ME11version" --pch "$ME11pch" --sku "$ME11sku" \ --fake-fpfs data/fpfs/zero --input "$_metmp" --output "$_me" @@ -164,16 +160,14 @@ extract_intel_me() extract_intel_me_bruteforce() { + e "$_metmp" f && x_ rm -Rf "$xbmklocal/metmp" && return 1 [ -L "$1" ] && return 0 - _r="-r" && [ -n "$mfs" ] && _r="" - "$mecleaner" $mfs $_r -t -O "$xbmklocal/a" -M "$_metmp" "$1" && \ - return 1 - "$mecleaner" $mfs $_r -t -O "$_metmp" "$1" && return 1 - "$me7updateparser" -O "$_metmp" "$1" && return 1 + _7ztest="${_7ztest}a" && _r="-r" && [ -n "$mfs" ] && _r="" - _7ztest="${_7ztest}a" - extract_archive "$1" "$_7ztest" || return 0 + "$mecleaner" $mfs $_r -t -O "$xbmklocal/a" -M "$_metmp" "$1" || \ + "$mecleaner" $mfs $_r -t -O "$_metmp" "$1" || "$me7updateparser" \ + -O "$_metmp" "$1" || extract_archive "$1" "$_7ztest" || return 0 fe_ extract_intel_me_bruteforce "$_7ztest" -type f || return 1; : } |