Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-07-05 14:33:36 +0200
committerErich Eckner <git@eckner.net>2017-07-05 14:33:36 +0200
commitb3c443f179afb0c5aa5c10788904c5e727bbfe59 (patch)
tree944070a23eebcae7c48cf695224cb404377a1a23
parent0a230ca024afb0a93be22577f42aacd5d1095b44 (diff)
bin/get-package-updates,bin/seed-build-list: fix/clean up regex throwing out staging and testing
-rwxr-xr-xbin/get-package-updates5
-rwxr-xr-xbin/seed-build-list2
2 files changed, 3 insertions, 4 deletions
diff --git a/bin/get-package-updates b/bin/get-package-updates
index 46b0440..7d82d78 100755
--- a/bin/get-package-updates
+++ b/bin/get-package-updates
@@ -178,10 +178,9 @@ for repo in ${repo_names}; do
grep '^\S\+ .\s[^/]\+/repos/[^/]\+/PKGBUILD$' | \
# ignore i686
grep -v -- '-i686/PKGBUILD$' | \
- sed 's|^\(\S\+\) \(.\)\t\([^/]\+\)/repos/\([^/]\+\)-[^/-]\+/PKGBUILD$|\2 \3 \1 \4|' | \
# ignore staging and testing
- grep -v '\(staging\|testing\)$' | \
- cat
+ grep -v -- '[-/]\(staging\|testing\)-[^/]\+/PKGBUILD$' | \
+ sed 's|^\(\S\+\) \(.\)\t\([^/]\+\)/repos/\([^/]\+\)-[^/-]\+/PKGBUILD$|\2 \3 \1 \4|'
done | \
sort -u | \
while read -r mode package git_revision repository; do
diff --git a/bin/seed-build-list b/bin/seed-build-list
index 3cba6d4..cf147c6 100755
--- a/bin/seed-build-list
+++ b/bin/seed-build-list
@@ -98,7 +98,7 @@ for repo in ${repo_names}; do
tar -t | \
grep '^[^/]\+/repos/[^/]\+/PKGBUILD$' | \
grep -v -- '-i686/PKGBUILD$' | \
- grep -v '\(staging\|testing\)$' | \
+ grep -v -- '[-/]\(staging\|testing\)-[^/]\+/PKGBUILD$' | \
sed '
s|^\([^/]\+\)/repos/\([^/]\+\)-[^/-]\+/PKGBUILD$|\1 \2|
'