From 883239ac2f0b8545cb63d899a0725a8b40b78784 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 13 Feb 2020 20:32:46 +0100
Subject: revert "remove hard-coded package suffixes" commits where they were
 unappropriate

---
 bin/local-build-package | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

(limited to 'bin/local-build-package')

diff --git a/bin/local-build-package b/bin/local-build-package
index a04cc0d..fd4fdab 100755
--- a/bin/local-build-package
+++ b/bin/local-build-package
@@ -7,6 +7,8 @@
 # shellcheck source=../lib/load-configuration
 . "${0%/*}/../lib/load-configuration"
 
+# TODO: remove hard-coded package suffixes
+
 # shellcheck disable=SC2016
 usage() {
   >&2 echo ''
@@ -171,9 +173,9 @@ if ! ${nobuild}; then
 
   extract_source_directory "${git_repo}" "${git_revision}" "${mod_git_revision}" "${tmp_dir}"
 
-  find . -maxdepth 1 -type f \
-    -regex '.*\.pkg\.\('"${package_compression_suffix_regex}"'\)\(\.sig\)\?' \
-    -delete
+  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,12 +192,11 @@ else
 fi
 
 if ${bootstrap}; then
-  find . -maxdepth 1 -type f \
-    -regex '.*\.pkg\.\('"${package_compression_suffix_regex}"'\)\.sig' \
-    -delete
+  rm -f \
+    ./*"-${arch}.pkg.tar.xz.sig" \
+    ./*"-${arch}.pkg.tar.zst.sig"
 
-  find . -maxdepth 1 -type f \
-    -regex '.*\.pkg\.\('"${package_compression_suffix_regex}"'\)' \
+  find . -maxdepth 1 -type f -name "*${arch}.pkg.tar.zst" \
     -execdir gpg --local-user="${signkey}" --detach-sign '{}' \;
 
   case "$repository" in
@@ -210,16 +211,8 @@ if ${bootstrap}; then
       ;;
   esac
 
-  # shellcheck disable=SC2046
-  scp -P "${bootstrap_port}" -rC $(
-    find "${tmp_dir}" -type f \
-      -regex '.*\.pkg\.\('"${package_compression_suffix_regex}"'\)\(\.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 $(
-    find "${tmp_dir}" -type f \
-      -regex '.*\.pkg\.\('"${package_compression_suffix_regex}"'\)' \
-      -printf '%f '
-  )'"
+  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-70-g09d2