diff options
| author | Erich Eckner <git@eckner.net> | 2019-08-20 11:56:35 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-08-20 11:56:35 +0200 |
| commit | abdb19a187d7c858ea24125e004bca01cbce88af (patch) | |
| tree | edc4a47e93112938a624ff5fffe2538be29055c9 | |
| parent | 638d2144f3a5505b934ef8b0be51e7b079ad401c (diff) | |
| download | builder-abdb19a187d7c858ea24125e004bca01cbce88af.tar.xz | |
bin/local-build-package: quote to make shellcheck happy, also make glob somewhat more restrictive
| -rwxr-xr-x | bin/local-build-package | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/local-build-package b/bin/local-build-package index c990042..49907a4 100755 --- a/bin/local-build-package +++ b/bin/local-build-package @@ -166,7 +166,7 @@ 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" cd "${tmp_dir}" || exit 1 @@ -183,7 +183,7 @@ else fi if ${bootstrap}; then - rm -f ./*"${arch}.pkg.tar.xz.sig" + rm -f ./*"-${arch}.pkg.tar.xz.sig" find . -maxdepth 1 -type f -name "*${arch}.pkg.tar.xz" \ -execdir gpg --local-user="${signkey}" --detach-sign '{}' \; @@ -200,8 +200,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.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'" fi # do not delete build reports, why might actually to want to have a look for things |