summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2024-12-06 10:34:36 +0000
committerLeah Rowe <leah@libreboot.org>2024-12-06 10:34:36 +0000
commite80261dd5451c7a0d16e34b11bb3b7ce07364b51 (patch)
treeb7f20398ece9f2978e19d2e362614fd0faf8223f
parentec581bde4753365df7c5509bce600ad6134693fe (diff)
Revert "vendor.sh: avoid unnecessary directory copy"20241206
Nope. It was correct before. fml This reverts commit 2d96fe2a1d13486d3ea6577beedcf3b2babf6cab.
-rw-r--r--include/vendor.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/vendor.sh b/include/vendor.sh
index 8c1ddcd4..3f78c368 100644
--- a/include/vendor.sh
+++ b/include/vendor.sh
@@ -176,8 +176,12 @@ apply_me11_deguard_mod()
extract_archive()
{
- innoextract "$1" -d "$2" || python "$pfs_extract" "$1" -e || 7z x \
+ geteltorito "$1" > "$2/vendor.img" || \
+ innoextract "$1" -d "$2" || python "$pfs_extract" "$1" -e || 7z x \
"$1" -o"$2" || unar "$1" -o "$2" || unzip "$1" -d "$2" || return 1
+
+ [ ! -d "${_dl}_extracted" ] || cp -R "${_dl}_extracted" "$2" || \
+ $err "!mv '${_dl}_extracted' '$2'"; :
}
extract_kbc1126ec()