Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/bin/return-assignment
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-08-02 14:32:30 +0200
committerErich Eckner <git@eckner.net>2017-08-02 14:32:30 +0200
commit93d2b2ee8ae79b565d57f1692f96f37695ef8b39 (patch)
treebd42cc7643b7bd5ceaff1327d25cb22e0a48486f /bin/return-assignment
parent8601cfbc675a80160118ada110eb0988f7ae3c59 (diff)
remove unnecessary and confusing quotes
Diffstat (limited to 'bin/return-assignment')
-rwxr-xr-xbin/return-assignment20
1 files changed, 10 insertions, 10 deletions
diff --git a/bin/return-assignment b/bin/return-assignment
index a057799..bfd4d5b 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -63,11 +63,11 @@ if [ "$5" = 'ERROR' ]; then
# unlock every loop this package would have broken and which is not
# broken by another locked package
- locked_packages="$(
+ locked_packages=$(
ls "${work_dir}/package-states/" | \
grep '\.locked$' | \
sed 's@^.*/\([^/]\+\)\.\([0-9a-f]\{40\}\.\)\{2\}[^.]\+\.locked$@\1@'
- )"
+ )
grep -lxF "${1}" "${work_dir}/build-list.loops/loop_"* 2> /dev/null | \
while read -r loop; do
if [ -z "$(
@@ -121,7 +121,7 @@ clean_up_tmp_dir() {
clean_up_lock_file
}
-tmp_dir="$(mktemp -d "${work_dir}/tmp.XXXXXX")"
+tmp_dir=$(mktemp -d "${work_dir}/tmp.XXXXXX")
cd "${tmp_dir}"
trap clean_up_tmp_dir EXIT
@@ -133,14 +133,14 @@ tar -x \
'*.pkg.tar.xz.sig'
# check if all packages are signed and all signatures belong to a package
-signature_errors="$(
+signature_errors=$(
ls -1 *.pkg.tar.xz{,.sig} | \
sed 's|\.sig$||' | \
sort | \
uniq -c | \
grep -v '^\s*2\s' | \
awk '{print $2}'
-)"
+)
if [ -n "${signature_errors}" ]; then
>&2 echo 'The following packages lack a signature or vice versa:'
@@ -149,11 +149,11 @@ if [ -n "${signature_errors}" ]; then
fi
# check if the sent packages are the expected ones
-packages="$(
+packages=$(
ls -1 | \
grep '\.pkg\.tar\.xz$'
-)"
-package_errors="$(
+)
+package_errors=$(
(
printf '%s\n' ${packages} | \
sed '
@@ -170,7 +170,7 @@ package_errors="$(
) | \
sort -k2 | \
uniq -u -f1
-)"
+)
if [ -n "${package_errors}" ]; then
>&2 echo 'The following packages should have been built but are missing or vice versa:'
@@ -179,7 +179,7 @@ if [ -n "${package_errors}" ]; then
fi
# move packages
-destination="$(official_or_community "$1.$2.$3.$4" 'staging')"
+destination=$(official_or_community "$1.$2.$3.$4" 'staging')
${master_mirror_rsync_command} \
"${master_mirror_rsync_directory}/i686/${destination}/${destination}.db."* \