From 9009a5fec52c5820fc90a68317bcc29cdbb42da1 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Fri, 3 Jan 2020 13:26:28 +0100 Subject: learn to handle zst, too --- bin/local-build-package | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'bin/local-build-package') diff --git a/bin/local-build-package b/bin/local-build-package index 7c88b3f..fd4fdab 100755 --- a/bin/local-build-package +++ b/bin/local-build-package @@ -173,7 +173,9 @@ if ! ${nobuild}; then extract_source_directory "${git_repo}" "${git_revision}" "${mod_git_revision}" "${tmp_dir}" - rm -f ./*"-${arch}.pkg.tar.xz" ./*"-${arch}.pkg.tar.xz.sig" + rm -f \ + ./*"-${arch}.pkg.tar.xz" ./*"-${arch}.pkg.tar.xz.sig" \ + ./*"-${arch}.pkg.tar.zst" ./*"-${arch}.pkg.tar.zst.sig" cd "${tmp_dir}" || exit 1 @@ -190,9 +192,11 @@ else fi if ${bootstrap}; then - rm -f ./*"-${arch}.pkg.tar.xz.sig" + rm -f \ + ./*"-${arch}.pkg.tar.xz.sig" \ + ./*"-${arch}.pkg.tar.zst.sig" - find . -maxdepth 1 -type f -name "*${arch}.pkg.tar.xz" \ + find . -maxdepth 1 -type f -name "*${arch}.pkg.tar.zst" \ -execdir gpg --local-user="${signkey}" --detach-sign '{}' \; case "$repository" in @@ -207,8 +211,8 @@ if ${bootstrap}; then ;; esac - scp -P "${bootstrap_port}" -rC "${tmp_dir}/"*"-${arch}.pkg.tar.xz" "${tmp_dir}/"*"-${arch}.pkg.tar.xz.sig" "${bootstrap_host}:${bootstrap_dir}/${staging_repo}/." - ssh -p "${bootstrap_port}" "${bootstrap_host}" bash -l -c "'cd ${bootstrap_dir}/${staging_repo} && repo-add -n bootstrap-${staging_repo}.db.tar.gz *-${arch}.pkg.tar.xz'" + scp -P "${bootstrap_port}" -rC "${tmp_dir}/"*"-${arch}.pkg.tar.zst" "${tmp_dir}/"*"-${arch}.pkg.tar.zst.sig" "${bootstrap_host}:${bootstrap_dir}/${staging_repo}/." + ssh -p "${bootstrap_port}" "${bootstrap_host}" bash -l -c "'cd ${bootstrap_dir}/${staging_repo} && repo-add -n bootstrap-${staging_repo}.db.tar.gz *-${arch}.pkg.tar.zst'" fi # do not delete build reports, why might actually to want to have a look for things -- cgit v1.2.3