diff options
| author | Erich Eckner <git@eckner.net> | 2020-01-03 13:28:42 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2020-01-03 13:28:42 +0100 |
| commit | afdf12e8d4b3c6100f9b8f9228a03575f6b7453f (patch) | |
| tree | 3e60de5803397af89bc17b737326494021fbb1ce | |
| parent | 9009a5fec52c5820fc90a68317bcc29cdbb42da1 (diff) | |
| download | builder-afdf12e8d4b3c6100f9b8f9228a03575f6b7453f.tar.xz | |
bin/build-packages,bin/return-assignment: xz -> zst: tar -J -> tar --zstd
| -rwxr-xr-x | bin/build-packages | 4 | ||||
| -rwxr-xr-x | bin/return-assignment | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/build-packages b/bin/build-packages index 776dfe5..8e16e60 100755 --- a/bin/build-packages +++ b/bin/build-packages @@ -745,7 +745,7 @@ while [ "${count}" -ne 0 ] && \ # we do not check "any" packages for linked libraries # (why do they have them in the first place?) mkdir "${package_content_dir}/${pkgfile##*/}" - tar -C "${package_content_dir}/${pkgfile##*/}" -xJf "${pkgfile}" 2>/dev/null + tar -C "${package_content_dir}/${pkgfile##*/}" -xf "${pkgfile}" --zstd 2>/dev/null # we rely on "${checksum}" not appearing in any objdump output : "${checksum?umm, checksum is unset - this will break below sed-fu}" # TODO: symbols may be in object files _inside_archives_ @@ -844,7 +844,7 @@ while [ "${count}" -ne 0 ] && \ rm -rf --one-file-system "${package_content_dir:?}/${pkgfile##*/}" fi { - tar -tJf "${pkgfile}" 2>/dev/null | \ + tar -tf "${pkgfile}" --zstd 2>/dev/null | \ sed -n ' s,^usr/lib/python\(2\?\)\([013-9.][0-9.]*\)/$,python\1 \1\2, t print diff --git a/bin/return-assignment b/bin/return-assignment index ec81b2d..831af1a 100755 --- a/bin/return-assignment +++ b/bin/return-assignment @@ -733,7 +733,7 @@ fi errors=$( find . -maxdepth 1 -name '*.pkg.tar.zst' | \ while read -r pkg; do - tar -OxJf "${pkg}" '.BUILDINFO' 2>/dev/null | \ + tar -Oxf "${pkg}" --zstd '.BUILDINFO' 2>/dev/null | \ grep -vxF 'packager = Unknown Packager' | \ grep -q '^packager = ' || \ printf '%s misses a valid packager.\n' \ |