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>
This commit is contained in:
parent
30616c4fde
commit
6aa42e1f6e
|
@ -27,6 +27,7 @@ export GIT_PACKAGING_NAMESPACE=archlinux/packaging/packages
|
||||||
export GIT_PACKAGING_NAMESPACE_ID=11323
|
export GIT_PACKAGING_NAMESPACE_ID=11323
|
||||||
export GIT_PACKAGING_URL_SSH="ssh://git@${GITLAB_HOST}/${GIT_PACKAGING_NAMESPACE}"
|
export GIT_PACKAGING_URL_SSH="ssh://git@${GITLAB_HOST}/${GIT_PACKAGING_NAMESPACE}"
|
||||||
export GIT_PACKAGING_URL_HTTPS="https://${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
|
# check if messages are to be printed using color
|
||||||
if [[ -t 2 && "$TERM" != dumb ]]; then
|
if [[ -t 2 && "$TERM" != dumb ]]; then
|
||||||
|
|
|
@ -119,6 +119,8 @@ if (( ${#needsversioning[*]} )); then
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
server=${PACKAGING_REPO_RELEASE_HOST}
|
||||||
rsyncopts=(-e ssh -p '--chmod=ug=rw,o=r' -c -h -L --progress --partial -y)
|
rsyncopts=(-e ssh -p '--chmod=ug=rw,o=r' -c -h -L --progress --partial -y)
|
||||||
archreleaseopts=()
|
archreleaseopts=()
|
||||||
while getopts ':l:a:s:f' flag; do
|
while getopts ':l:a:s:f' flag; do
|
||||||
|
@ -155,10 +157,6 @@ done
|
||||||
# check for PKGBUILD standards
|
# check for PKGBUILD standards
|
||||||
check_pkgbuild_validity
|
check_pkgbuild_validity
|
||||||
|
|
||||||
if [[ -z $server ]]; then
|
|
||||||
server='repos.archlinux.org'
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -n $(git status --short --untracked-files=no) ]]; then
|
if [[ -n $(git status --short --untracked-files=no) ]]; then
|
||||||
stat_busy 'Staging files'
|
stat_busy 'Staging files'
|
||||||
for f in $(git ls-files --modified); do
|
for f in $(git ls-files --modified); do
|
||||||
|
|
Loading…
Reference in New Issue