From 011727c0a00bf1632a2a9563aacce9903aa0b631 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Fri, 3 Jan 2020 09:27:04 +0100 Subject: bin/build-packages, bin/return-assignment: xz -> zst --- bin/return-assignment | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'bin/return-assignment') diff --git a/bin/return-assignment b/bin/return-assignment index 09b388c..ec81b2d 100755 --- a/bin/return-assignment +++ b/bin/return-assignment @@ -613,11 +613,11 @@ export TMPDIR="${tmp_dir}" tar -x \ --wildcards \ --no-wildcards-match-slash \ - '*.pkg.tar.xz' \ - '*.pkg.tar.xz.sig' \ - '*.pkg.tar.xz-namcap.log.gz' \ - '*.pkg.tar.xz.so.needs.gz' \ - '*.pkg.tar.xz.so.provides.gz' + '*.pkg.tar.zst' \ + '*.pkg.tar.zst.sig' \ + '*.pkg.tar.zst-namcap.log.gz' \ + '*.pkg.tar.zst.so.needs.gz' \ + '*.pkg.tar.zst.so.provides.gz' # check if all packages come with: # - a package file @@ -628,28 +628,28 @@ tar -x \ missing_files=$( find . -maxdepth 1 \( \ \( \ - -name '*.pkg.tar.xz' \ + -name '*.pkg.tar.zst' \ -printf '%f package\n' \ \) -o \ \( \ - -name '*.pkg.tar.xz.sig' \ + -name '*.pkg.tar.zst.sig' \ -printf '%f signature\n' \ \) -o \ \( \ - -name '*.pkg.tar.xz-namcap.log.gz' \ + -name '*.pkg.tar.zst-namcap.log.gz' \ -printf '%f namcap\n' \ \) -o \ \( \ - -name '*.pkg.tar.xz.so.needs.gz' \ + -name '*.pkg.tar.zst.so.needs.gz' \ -printf '%f needed-libraries\n' \ \) -o \ \( \ - -name '*.pkg.tar.xz.so.provides.gz' \ + -name '*.pkg.tar.zst.so.provides.gz' \ -printf '%f provided-libraries\n' \ \) \ \) | \ sed ' - s/\(\.pkg\.tar\.xz\)\(\.sig\|\(-namcap\.log\|\.so\.\(provides\|needs\)\)\.gz\) /\1 / + s/\(\.pkg\.tar\.zst\)\(\.sig\|\(-namcap\.log\|\.so\.\(provides\|needs\)\)\.gz\) /\1 / ' | \ sort -k1,1 -k2,2 | \ sed ' @@ -707,7 +707,7 @@ fi # check if the signatures are valid signatures=$( - find . -maxdepth 1 -name '*.pkg.tar.xz' \ + find . -maxdepth 1 -name '*.pkg.tar.zst' \ -printf 'package file %f\n' \ -exec gpg --batch --status-fd 1 -q --homedir /etc/pacman.d/gnupg --verify '{}.sig' '{}' \; 2> /dev/null ) @@ -731,7 +731,7 @@ fi # check if the package maintainer is set errors=$( - find . -maxdepth 1 -name '*.pkg.tar.xz' | \ + find . -maxdepth 1 -name '*.pkg.tar.zst' | \ while read -r pkg; do tar -OxJf "${pkg}" '.BUILDINFO' 2>/dev/null | \ grep -vxF 'packager = Unknown Packager' | \ @@ -751,7 +751,7 @@ if [ -n "${errors}" ]; then fi # check if the sent packages are the expected ones -find . -maxdepth 1 -name '*.pkg.tar.xz' -printf '%f\n' > \ +find . -maxdepth 1 -name '*.pkg.tar.zst' -printf '%f\n' > \ "${tmp_dir}/packages" # shellcheck disable=SC2016 @@ -946,12 +946,12 @@ cut -d' ' -f4,5 "${tmp_dir}/repository-ids" | \ # upload the packages into /pool failsafe_rsync -c --copy-dest=/.transfer \ - ./*".pkg.tar.xz" \ - ./*".pkg.tar.xz.sig" \ + ./*".pkg.tar.zst" \ + ./*".pkg.tar.zst.sig" \ "${master_mirror_rsync_directory}/pool/" # create symlinks -find . \( -name '*.pkg.tar.xz' -o -name '*.pkg.tar.xz.sig' \) -printf '%f\n' | \ +find . \( -name '*.pkg.tar.zst' -o -name '*.pkg.tar.zst.sig' \) -printf '%f\n' | \ while read -r file; do rm "${file}" ln -s "../../pool/${file}" "${file}" -- cgit v1.2.3-70-g09d2