From e80261dd5451c7a0d16e34b11bb3b7ce07364b51 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Fri, 6 Dec 2024 10:34:36 +0000 Subject: Revert "vendor.sh: avoid unnecessary directory copy" Nope. It was correct before. fml This reverts commit 2d96fe2a1d13486d3ea6577beedcf3b2babf6cab. --- include/vendor.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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() -- cgit v1.2.1