From ac0742c7dff1f1ee5b8f086db5a2cfde40c00daa Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 2 Jul 2021 17:56:28 +0200 Subject: [PATCH] makerepo: detect centpkg for CentOS Stream dist-git --- contrib/fedora/utils/makerepo.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/contrib/fedora/utils/makerepo.sh b/contrib/fedora/utils/makerepo.sh index 3a772f1941..25fe441fc3 100755 --- a/contrib/fedora/utils/makerepo.sh +++ b/contrib/fedora/utils/makerepo.sh @@ -84,11 +84,16 @@ if [[ "x$(ls -1d ./*.spec 2>/dev/null)" == x || ! -f "./sources" ]]; then fi if [[ "$FEDPKG" == "" ]]; then - REMOTES="$(git remote -v 2>/dev/null)" || die "not inside dist-git repository? >>$PWD<<" - if echo "$REMOTES" | grep -q -F 'pkgs.devel.redhat.com' ; then + REMOTE="$(git config --get "branch.$(git branch --show-current).remote" 2>/dev/null)" + URL="$(git config --get "remote.$REMOTE.url")" + if [[ "$URL" = *'pkgs.devel.redhat.com'* ]]; then FEDPKG=rhpkg - else + elif [[ "$URL" = *'gitlab.com:redhat/centos-stream'* ]]; then + FEDPKG=centpkg + elif [[ "$URL" = *'pkgs.fedoraproject.org/'* ]]; then FEDPKG=fedpkg + else + die "not inside dist-git repository? Check out a branch that has the dist-git remote tracking branch >>$PWD<<" fi fi