From b3c443f179afb0c5aa5c10788904c5e727bbfe59 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Wed, 5 Jul 2017 14:33:36 +0200 Subject: bin/get-package-updates,bin/seed-build-list: fix/clean up regex throwing out staging and testing --- bin/get-package-updates | 5 ++--- bin/seed-build-list | 2 +- 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| ' -- cgit v1.2.3-70-g09d2