summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2020-02-14 09:02:07 +0100
committerErich Eckner <git@eckner.net>2020-02-14 09:02:07 +0100
commitbdc26265f6a3f20de17357755ef675d2571baffa (patch)
treed75c3e7ac7edcf829d8af00e61bc014b4b14759a
parent883239ac2f0b8545cb63d899a0725a8b40b78784 (diff)
downloadbuilder-bdc26265f6a3f20de17357755ef675d2571baffa.tar.xz
set -regextype in find
-rwxr-xr-xbin/filter-build-logs2
-rwxr-xr-xbin/return-assignment12
2 files changed, 7 insertions, 7 deletions
diff --git a/bin/filter-build-logs b/bin/filter-build-logs
index 398b0e8..7537655 100755
--- a/bin/filter-build-logs
+++ b/bin/filter-build-logs
@@ -25,7 +25,7 @@
'type' \
'message'
printf '</tr>\n'
- find "${build_log_directory}/success" -maxdepth 1 \
+ find "${build_log_directory}/success" -maxdepth 1 -regextype sed \
-regex '.*\.pkg\.\('"${package_compression_suffix_regex}"'\)-namcap\.log\.gz' \
-execdir zcat {} \; | \
sed '
diff --git a/bin/return-assignment b/bin/return-assignment
index e7f75ed..8242215 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -620,7 +620,7 @@ tar -x
# - a list of needed libraries
# - a list of provided libraries
missing_files=$(
- find . -maxdepth 1 \( \
+ find . -maxdepth 1 -regextype sed \( \
\( \
-regex '.*\.pkg\.\('"${package_compression_suffix_regex}"'\)' \
-printf '%f package\n' \
@@ -701,7 +701,7 @@ fi
# check if the signatures are valid
signatures=$(
- find . -maxdepth 1 \
+ find . -maxdepth 1 -regextype sed \
-regex '.*\.pkg\.\('"${package_compression_suffix_regex}"'\)' \
-printf 'package file %f\n' \
-exec gpg --batch --status-fd 1 -q --homedir /etc/pacman.d/gnupg --verify '{}.sig' '{}' \; 2> /dev/null
@@ -726,7 +726,7 @@ fi
# check if the package maintainer is set
errors=$(
- find . -maxdepth 1 \
+ find . -maxdepth 1 -regextype sed \
-regex '.*\.pkg\.\('"${package_compression_suffix_regex}"'\)' | \
while read -r pkg; do
tar -Oxf "${pkg}" --zstd '.BUILDINFO' 2>/dev/null | \
@@ -747,7 +747,7 @@ if [ -n "${errors}" ]; then
fi
# check if the sent packages are the expected ones
-find . -maxdepth 1 \
+find . -maxdepth 1 -regextype sed \
-regex '.*\.pkg\.\('"${package_compression_suffix_regex}"'\)' \
-printf '%f\n' > \
"${tmp_dir}/packages"
@@ -968,7 +968,7 @@ cut -d' ' -f4,5 "${tmp_dir}/repository-ids" | \
# upload the packages into /pool
{
printf 'failsafe_rsync -c --copy-dest=/.transfer'
- find "${tmp_dir}" -maxdepth 1 \
+ find "${tmp_dir}" -maxdepth 1 -regextype sed \
-regex '.*\.pkg\.\('"${package_compression_suffix_regex}"'\)\(\.sig\)\?' \
-printf ' "%p"'
printf ' "%s/pool/"\n' \
@@ -978,7 +978,7 @@ cut -d' ' -f4,5 "${tmp_dir}/repository-ids" | \
# create symlinks
{
- find . \
+ find . -regextype sed \
-regex '.*\.pkg\.\('"${package_compression_suffix_regex}"'\)\(\.sig\)\?' \
-printf '%f\n' | \
while read -r file; do