Commit 760c1c6c authored by Eric Bélanger's avatar Eric Bélanger Committed by Allan McRae
Browse files

commitpkg: Added split package support 



All packages created by the PKGBUILD are uploaded to the staging directory.
The output and svn commit messages uses pkgbase instead of pkgname.

Signed-off-by: default avatarEric Blanger <snowmaniscool@gmail.com>
[Allan: minor fix for existing issue]
Signed-off-by: default avatarAllan McRae <allan@archlinux.org>
parent f9aa28f8

commitpkg

+57 −54
Original line number Diff line number Diff line
@@ -26,13 +26,15 @@ if [ -z "$CARCH" ]; then 
fi



source PKGBUILD

pkgfile=${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}

anypkgfile=${pkgname}-${pkgver}-${pkgrel}-any${PKGEXT}

pkgbase=${pkgbase:-${pkgname[0]}}



for _pkgname in ${pkgname[@]}; do

    pkgfile=${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}

    anypkgfile=${_pkgname}-${pkgver}-${pkgrel}-any${PKGEXT}



    if [ ! -f $pkgfile ]; then

	if [ -f $PKGDEST/$pkgfile ]; then

            pkgfile=$PKGDEST/$pkgfile

	anypkgfile=$PKGDEST/$anypkgfile

	elif [ -f $anypkgfile ]; then

	    pkgfile=$anypkgfile

	    CARCH=any
@@ -87,15 +89,16 @@ if [ $? -ne 0 ]; then 
	exit 1

    fi

    echo "===> Uploaded $pkgfile"

done



if [ "$1" != "" ]; then

    svn commit -m "upgpkg: $pkgname $pkgver-$pkgrel

    svn commit -m "upgpkg: $pkgbase $pkgver-$pkgrel

    $1" > /dev/null

    if [ $? -ne 0 ]; then

        echo "Cancelled"

        exit 1

    fi

    echo "===> Commited with \"upgpkg: $pkgname $pkgver-$pkgrel

    echo "===> Commited with \"upgpkg: $pkgbase $pkgver-$pkgrel

    $1\" message"

else

    svn commit >/dev/null
@@ -103,7 +106,7 @@ else 
        echo "Cancelled"

        exit 1

    fi

    echo "===> Commited with \"upgpkg: $pkgname $pkgver-$pkgrel\" message"

    echo "===> Commited with \"upgpkg: $pkgbase $pkgver-$pkgrel\" message"

fi



archrelease $repo-$CARCH