Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLevente Polyak <anthraxx@archlinux.org>2022-09-12 19:55:03 +0200
committerLevente Polyak <anthraxx@archlinux.org>2023-05-19 22:27:12 +0200
commit6aa42e1f6e913fd8706bd809f784f6c492762a20 (patch)
treef1f088a03d6f17531c870abc313d4d4a3994dfc1
parent30616c4fdea37dda26c33d4f94052b99dba2401d (diff)
commitpkg: use library location for common server and remote properties
It makes a lot of sense to have them in a central place that can be swapped and also re-used across different execution units. Hence lets move the repos.archlinux.org host to lib/common.sh Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
-rw-r--r--lib/common.sh1
-rw-r--r--src/commitpkg.in6
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/common.sh b/lib/common.sh
index fe6450a..d2351af 100644
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -27,6 +27,7 @@ export GIT_PACKAGING_NAMESPACE=archlinux/packaging/packages
export GIT_PACKAGING_NAMESPACE_ID=11323
export GIT_PACKAGING_URL_SSH="ssh://git@${GITLAB_HOST}/${GIT_PACKAGING_NAMESPACE}"
export GIT_PACKAGING_URL_HTTPS="https://${GITLAB_HOST}/${GIT_PACKAGING_NAMESPACE}"
+export PACKAGING_REPO_RELEASE_HOST=repos.archlinux.org
# check if messages are to be printed using color
if [[ -t 2 && "$TERM" != dumb ]]; then
diff --git a/src/commitpkg.in b/src/commitpkg.in
index 0c65658..7b6e904 100644
--- a/src/commitpkg.in
+++ b/src/commitpkg.in
@@ -119,6 +119,8 @@ if (( ${#needsversioning[*]} )); then
done
fi
+
+server=${PACKAGING_REPO_RELEASE_HOST}
rsyncopts=(-e ssh -p '--chmod=ug=rw,o=r' -c -h -L --progress --partial -y)
archreleaseopts=()
while getopts ':l:a:s:f' flag; do
@@ -155,10 +157,6 @@ done
# check for PKGBUILD standards
check_pkgbuild_validity
-if [[ -z $server ]]; then
- server='repos.archlinux.org'
-fi
-
if [[ -n $(git status --short --untracked-files=no) ]]; then
stat_busy 'Staging files'
for f in $(git ls-files --modified); do