summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-12-04 10:26:35 +0100
committerErich Eckner <git@eckner.net>2017-12-04 10:26:35 +0100
commitdc8edb511b07f4729436bb8f883d4b73845a9d43 (patch)
tree36c7110324511170fc34872bd39d57ea32ccfd3c
parent019fdbd77a60d54dceb0cc400a943cc2fc220497 (diff)
downloadbuilder-dc8edb511b07f4729436bb8f883d4b73845a9d43.tar.xz
bin/build-packages: remove sub_pkgrel before downloading x86_64 package for namcap report.
-rwxr-xr-xbin/build-packages7
1 files changed, 5 insertions, 2 deletions
diff --git a/bin/build-packages b/bin/build-packages
index 5d5a9e2..f99a3a5 100755
--- a/bin/build-packages
+++ b/bin/build-packages
@@ -339,7 +339,10 @@ while [ "${count}" -ne 0 ]; do
sponge | \
while read -r pkg_file; do
{
- pacman -Spdd --print-format '%l' --noconfirm "${pkg_file%-*-*-*}"
+ pacman -Spdd --print-format '%l' --noconfirm "${pkg_file%-*-*-*}" | \
+ sed '
+ s|/[^/]\+\.pkg\.tar\.xz$||
+ '
# shellcheck disable=SC2016
curl -Ss 'https://www.archlinux.org/mirrorlist/?country=all&protocol=https&tier=1&use_mirror_status=on' | \
sed -n '
@@ -352,8 +355,8 @@ while [ "${count}" -ne 0 ]; do
shuf
} | \
sed '
- s|/[^/]\+\.pkg\.tar\.xz$||
s|$|/'"${pkg_file}"'|
+ s/\.[0-9]\+\(-[^-]\+\)$/\1/
s/-i686\(\.pkg\.tar\.xz\)$/-x86_64\1/
' | \
while read -r url; do