diff options
author | Leah Rowe <leah@libreboot.org> | 2024-12-06 01:24:35 +0000 |
---|---|---|
committer | Leah Rowe <leah@libreboot.org> | 2024-12-06 01:24:35 +0000 |
commit | 2dc7c5fa7203b20c9251f72d99c4e4c7e07c4b72 (patch) | |
tree | 8efd2eb80a19d1d3477401756c43ce4b5bd3bd9d /include | |
parent | 56b35bd9d8d6189c6bf905716bf8f946a6c88a0f (diff) |
vendor.sh: fix minor release bug
I should have copied the extract directory, in cases
where it appears as filename_extracted/ under cache/,
but I was moving it instead.
Both locations (cache/file/*_extracted/
and vendorfiles/appdir/) get deleted, on every run of
the vendor script, per target, so this is OK.
The only sin is additional use of disk space, for
archives that are mostly very small and get immediately
deleted anyway.
This one lbmk bug, minor though it may be, prevented
the Libreboot 20241205 release, which (since it's now
the 6th of December) will become Libreboot 20241206
instead - and that gives me time to contemplate whether
I want to do one more change that I had planned for the 5th!
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/vendor.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/vendor.sh b/include/vendor.sh index 201359d7..3f78c368 100644 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -180,7 +180,7 @@ extract_archive() 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" ] || mv "${_dl}_extracted" "$2" || \ + [ ! -d "${_dl}_extracted" ] || cp -R "${_dl}_extracted" "$2" || \ $err "!mv '${_dl}_extracted' '$2'"; : } |