index : builder | |
Archlinux32 build system | gitolite user |
summaryrefslogtreecommitdiff |
author | Erich Eckner <git@eckner.net> | 2018-04-10 13:47:42 +0200 |
---|---|---|
committer | Erich Eckner <git@eckner.net> | 2018-04-10 13:47:42 +0200 |
commit | f165f3e18ca41768917459b82e757bae066c463c (patch) | |
tree | 8a2fed16b3b9732eaa34efb002ac598fd9360645 /lib | |
parent | 8976bf23af37c5e372644d1d10291a37cd66c1f2 (diff) |
-rwxr-xr-x | lib/common-functions | 6 |
diff --git a/lib/common-functions b/lib/common-functions index 4184b78..aebf17f 100755 --- a/lib/common-functions +++ b/lib/common-functions @@ -36,9 +36,9 @@ find_pkgbuilds() { eval 'repo_path="${repo_paths__'"${git_repository}"'}"' PKGBUILD=$( - git -C "${repo_path}" archive "${git_revision}" -- "${package}/repos/" 2> /dev/null | \ + git -C "${repo_path}" archive "${git_revision}" -- "${package}/repos/${repository}-*/PKGBUILD" 2> /dev/null | \ tar -t 2> /dev/null | \ - grep "$(printf '^%s-.*/PKGBUILD' "$(str_to_regex "${package}/repos/${repository}")")" | \ + grep -- '/PKGBUILD$' | \ grep -v -- '-i686/PKGBUILD$' | \ grep -v -- '[-/]\(staging\|testing\|unstable\)-[^/]\+/PKGBUILD$' | \ sort | \ @@ -46,7 +46,7 @@ find_pkgbuilds() { ) PKGBUILD_mod=$( - git -C "${repo_paths__archlinux32}" archive "${mod_git_revision}" 2> /dev/null | \ + git -C "${repo_paths__archlinux32}" archive "${mod_git_revision}" -- "${repository}/${package}/PKGBUILD" 2> /dev/null | \ tar -t "${repository}/${package}/PKGBUILD" 2> /dev/null ) || true |