summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-08-02 14:48:11 +0200
committerErich Eckner <git@eckner.net>2017-08-02 14:48:11 +0200
commit08fd25502287ba6ad3e141b9a595df879acc7968 (patch)
tree780cde59db7defcd279709455923384bb5147ba0
parent93d2b2ee8ae79b565d57f1692f96f37695ef8b39 (diff)
downloadbuilder-08fd25502287ba6ad3e141b9a595df879acc7968.tar.xz
clean up some bashisms
-rwxr-xr-xbin/clean-cache2
-rwxr-xr-xbin/common-functions7
-rwxr-xr-xbin/return-assignment2
3 files changed, 7 insertions, 4 deletions
diff --git a/bin/clean-cache b/bin/clean-cache
index 83657b6..b7cef9f 100755
--- a/bin/clean-cache
+++ b/bin/clean-cache
@@ -15,7 +15,7 @@ fi
repos='build-support community-staging community-testing community core extra gnome-unstable kde-unstable staging testing'
-mirror"$(
+mirror=$(
grep -m1 '^Server = ' '/etc/pacman.d/mirrorlist32' | \
cut -d= -f2 | \
sed 's|^\s*||'
diff --git a/bin/common-functions b/bin/common-functions
index 08fe9ab..14ae06e 100755
--- a/bin/common-functions
+++ b/bin/common-functions
@@ -14,10 +14,13 @@ find_pkgbuilds() {
local git_revision="$4"
local mod_git_revision="$5"
+ local repo_path
+ eval 'repo_path="${repo_paths__'"${git_repository}"'}"'
+
PKGBUILD=$(
- eval git -C "$(printf '"${repo_paths__%s}"' "${git_repository}")" 'archive "${git_revision}" -- "${package}/repos/"' 2> /dev/null | \
+ git -C "${repo_path}" archive "${git_revision}" -- "${package}/repos/" 2> /dev/null | \
tar -t 2> /dev/null | \
- grep "^$(str_to_regex "${package}/repos/${repository}")"'-.*/PKGBUILD$' | \
+ grep "$(printf '^%s-.*/PKGBUILD' "$(str_to_regex "${package}/repos/${repository}")")" | \
grep -v -- '-i686/PKGBUILD$' | \
grep -v -- '[-/]\(staging\|testing\|unstable\)-[^/]\+/PKGBUILD$' | \
sort | \
diff --git a/bin/return-assignment b/bin/return-assignment
index bfd4d5b..ab28c90 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -134,7 +134,7 @@ tar -x \
# check if all packages are signed and all signatures belong to a package
signature_errors=$(
- ls -1 *.pkg.tar.xz{,.sig} | \
+ ls -1 *.pkg.tar.xz *.pkg.tar.xz.sig | \
sed 's|\.sig$||' | \
sort | \
uniq -c | \