diff options
| author | Michael Forney <mforney@mforney.org> | 2025-04-28 14:27:49 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2025-04-28 14:27:49 -0700 |
| commit | ea3cbbd89c92c107b719e121e2675d22a75585f7 (patch) | |
| tree | 9f0efbe533f704ce19c96c01ffc416a9d8e96218 /scripts | |
| parent | 95cf1ad5e0a86b62260f6a5eb24cc9cf33d92d0a (diff) | |
Use our own pax for extracting archives
This reduces dependencies and variability in pax implementations.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/extract.sh | 9 | ||||
| -rw-r--r-- | scripts/fetch-curl.sh | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/scripts/extract.sh b/scripts/extract.sh index 4a1ad044..5205bee0 100644 --- a/scripts/extract.sh +++ b/scripts/extract.sh @@ -8,11 +8,4 @@ case $file in *) exit 0 esac -if command -v bsdtar >/dev/null; then - exec bsdtar -xf "$file" "$@" -elif command -v pax >/dev/null; then - "$tool" -d -c "$file" | pax -r "$@" -else - printf '%s: bsdtar or pax is required' "$0" >&2 - exit 1 -fi +"$tool" -d -c "$file" | "$PAX" -r "$@" diff --git a/scripts/fetch-curl.sh b/scripts/fetch-curl.sh index 16cb88d7..0ff3d9a1 100644 --- a/scripts/fetch-curl.sh +++ b/scripts/fetch-curl.sh @@ -20,7 +20,7 @@ if ! sh "$OLDPWD/scripts/checksum.sh" -c sha256 2>/dev/null ; then fi while read -r _ archive ; do - sh "$OLDPWD/scripts/extract.sh" "$archive" -s ',^[^/]*,src,' '*/*' + sh "$OLDPWD/scripts/extract.sh" "$archive" -s ',^[^/]*,src,' done <sha256 if [ -d patch ] ; then |