Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2020-07-01 13:54:06 +0200
committerErich Eckner <git@eckner.net>2020-07-01 13:54:06 +0200
commit231dd2709f60a416344d878314a39cecad8ec812 (patch)
tree0eb518211784fb85b5cf9175531af5a50c02a9e1
parent6801a806c1f4ed6e0025f6befa4c50a24d65f8dd (diff)
update-archlinux32-package: cleanup: use update_checksum()
-rwxr-xr-xupdate-archlinux32-package79
1 files changed, 12 insertions, 67 deletions
diff --git a/update-archlinux32-package b/update-archlinux32-package
index aaece52..28190e5 100755
--- a/update-archlinux32-package
+++ b/update-archlinux32-package
@@ -219,52 +219,17 @@ case ${update_path} in
fi
scp -r "${used_upstream_git_path}/${pkgname}/repos/${repo}-${repo_arch}" \
"arch32-test:${pkgname}"
- sums=$(
- ssh arch32-test '
- cd "'"${pkgname}"'"
- cat >> PKGBUILD
- echo '"'"'[ "${arch[0]}" = any ] || arch+=(i686 pentium4)'"'"' >> PKGBUILD
- makepkg -g
- ' < "${git_repo_path}/${repo}/${pkgname}/PKGBUILD" \
- | sed -n "$(
- sed '
- s,^\([^[:space:]=]\+sums\(_[^[:space:]=]\+\)\?=\).*$,/^\1/ { :a; $be; N; /(.*)/ { p; d; }; :e; p },
- t
- d
- ' "${git_repo_path}/${repo}/${pkgname}/PKGBUILD" \
- | sort -u
- )" \
- | sed '
- $! s/$/\\n/
- ' | \
- tr -d '\n'
- )
- sed -i '
- /^\S\+sums\(_[^=]\+\)\?=(/{
- :a
- s/^\S\+sums[^=]*=(.*)/'"${sums}"'/
- tb
- $b
- N
- ba
- :b
- p
- :c
- s/\(^\|\n\)\S\+sums[^=]*=([^()]*)\($\|\n\)/\1\2/
- s/\n\n\+/\n/g
- $! {
- N
- bc
- }
- }
- ' "${git_repo_path}/${repo}/${pkgname}/PKGBUILD"
- if ! cat "${used_upstream_git_path}/${pkgname}/repos/${repo}-${repo_arch}/PKGBUILD" "${git_repo_path}/${repo}/${pkgname}/PKGBUILD" \
- | ssh arch32-test '
- cd "'"${pkgname}"'"
- cat > PKGBUILD
- echo '"'"'[ "${arch[0]}" = any ] || arch+=(i686 pentium4)'"'"' >> PKGBUILD
- makepkg --verifysource
- '; then
+ ssh arch32-test '
+ cd "'"${pkgname}"'"
+ cat >> PKGBUILD
+ echo '"'"'[ "${arch[0]}" = any ] || arch+=(i686 pentium4)'"'"' >> PKGBUILD
+ ' < "${git_repo_path}/${repo}/${pkgname}/PKGBUILD"
+ update_checksum
+ if ! ssh arch32-test '
+ cd "'"${pkgname}"'"
+ cat > PKGBUILD
+ makepkg --verifysource
+ ' < "${git_repo_path}/${repo}/${pkgname}/PKGBUILD"; then
>&2 echo 'something went wrong'
exit 1
fi
@@ -291,27 +256,7 @@ case ${update_path} in
git -C "${git_repo_path}/${repo}/${pkgname}" diff HEAD -- PKGBUILD
scp -r "${git_repo_path}/${repo}/${pkgname}" \
"arch32-test:${pkgname}"
- sums=$(
- ssh arch32-test '
- cd "'"${pkgname}"'"
- echo '"'"'[ "${arch[0]}" = any ] || arch+=(i686 pentium4)'"'"' >> PKGBUILD
- makepkg -g
- ' \
- | sed '
- $! s/$/\\n/
- ' | \
- tr -d '\n'
- )
- echo "'$sums'"
- sed -i '
- /^\S\+sums\(_[^=]\+\)\?=(/{
- :a
- $b
- N
- s/^\S\+sums[^=]*=(.*)/'"${sums}"'/
- Ta
- }
- ' "${git_repo_path}/${repo}/${pkgname}/PKGBUILD"
+ update_checksum
if ! ssh arch32-test '
cd "'"${pkgname}"'"
cat > PKGBUILD