summaryrefslogtreecommitdiff
path: root/bin/common-functions
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-06-26 23:49:21 +0200
committerErich Eckner <git@eckner.net>2017-06-26 23:49:21 +0200
commitcc334de8754a35904e4c58348302effe23c4e9e0 (patch)
tree9f6ec0db74c4ec72cb33474a78437d27fcf4f16a /bin/common-functions
parent23f205cd74f2ad9784af979e0257964a1a251d25 (diff)
downloadbuilder-cc334de8754a35904e4c58348302effe23c4e9e0.tar.xz
bin/common-functions: ignore testing and staging, too (not only *-testing and *-staging)
Diffstat (limited to 'bin/common-functions')
-rwxr-xr-xbin/common-functions4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/common-functions b/bin/common-functions
index 15519a9..32c2e0a 100755
--- a/bin/common-functions
+++ b/bin/common-functions
@@ -43,7 +43,7 @@ find_pkgbuild() {
ls "${package_path}/repos/${repository}-"*"/PKGBUILD" 2> /dev/null | \
tr ' ' '\n' | \
grep -v -- '-i686/PKGBUILD$' | \
- grep -v -- '-\(staging\|testing\)-[^/]\+/PKGBUILD$' | \
+ grep -v -- '[-/]\(staging\|testing\)-[^/]\+/PKGBUILD$' | \
sort | \
tail -n1
)"
@@ -387,7 +387,7 @@ make_source_info() {
tar -t 2> /dev/null | \
grep "^$(str_to_regex "${package}/repos/${repository}")"'-.*/PKGBUILD$' | \
grep -v -- '-i686/PKGBUILD$' | \
- grep -v -- '-\(staging\|testing\)-[^/]\+/PKGBUILD$' | \
+ grep -v -- '[-/]\(staging\|testing\)-[^/]\+/PKGBUILD$' | \
sort | \
tail -n1
)"