summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2020-02-13 15:12:58 +0100
committerErich Eckner <git@eckner.net>2020-02-13 15:12:58 +0100
commit471418a1f18f1675ebc0f5522275d262cefc91e0 (patch)
tree8dde3f4cc889d921df4fbaf0556fd0b80d642e7d
parentf9d3cde04e4d7228d425cc76da76f0a96af75d36 (diff)
downloadbuilder-471418a1f18f1675ebc0f5522275d262cefc91e0.tar.xz
bin/interpret-mail: removed some hard-coded package suffixes
-rwxr-xr-xbin/interpret-mail6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/interpret-mail b/bin/interpret-mail
index cc7690e..1d6bf7f 100755
--- a/bin/interpret-mail
+++ b/bin/interpret-mail
@@ -5,7 +5,7 @@
# shellcheck source=../lib/load-configuration
. "${0%/*}/../lib/load-configuration"
-# TODO: remove hard-coded package suffixes
+# TODO: remove hard-coded default package suffixes
# shellcheck disable=SC2016
if [ $# -ne 0 ]; then
@@ -275,7 +275,7 @@ fi
if [ -s "${tmp_dir}/copy-to-build-support" ]; then
sed -i '
- /\.pkg\.tar\.\(xz\|zst\)$/!s/$/.pkg.tar.zst/
+ /\.pkg\.\('"${package_compression_suffix_regex}"'\)$/!s/$/.pkg.tar.zst/
' "${tmp_dir}/copy-to-build-support"
if run_and_log_on_error 'copy-to-build-support' "${base_dir}/bin/copy-to-build-support" --wait "${tmp_dir}/copy-to-build-support"; then
log 1 'copy-to-build-support' "$(wc -l < "${tmp_dir}/copy-to-build-support")"
@@ -324,7 +324,7 @@ fi
if [ -s "${tmp_dir}/stabilize" ]; then
sed -i '
- /\.pkg\.tar\.\(xz\|zst\)$/!s/$/.pkg.tar.zst/
+ /\.pkg\.\('"${package_compression_suffix_regex}"'\)$/!s/$/.pkg.tar.zst/
' "${tmp_dir}/stabilize"
if run_and_log_on_error 'stabilize' "${base_dir}/bin/modify-package-state" --wait --tested "${tmp_dir}/stabilize"; then
log 1 'stabilize' "$(wc -l < "${tmp_dir}/stabilize")"