Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/bin/local-build-package
diff options
context:
space:
mode:
Diffstat (limited to 'bin/local-build-package')
-rwxr-xr-xbin/local-build-package29
1 files changed, 11 insertions, 18 deletions
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