Commit 30aab9b9 authored by Allan McRae's avatar Allan McRae
Browse files

devtools: clean-up of commitpkg 



- replaces backticks by $()
- removes support for package names without the arch in them (all our
repos now uses the arch in the package name)
- removes support for the obsolete and dead [unstable] repo

Patch-by: default avatarEric Bélanger <eric@archlinux.org>
Signed-off-by: default avatarAllan McRae <allan@archlinux.org>
parent d8d0c876

commitpkg

+1 −9
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ if [ -r ~/.makepkg.conf ]; then 
	source ~/.makepkg.conf

fi



cmd=`basename $0`

cmd=$(basename $0)



if [ ! -f PKGBUILD ]; then

    echo "No PKGBUILD file"
@@ -28,23 +28,17 @@ fi 
source PKGBUILD

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

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

oldstylepkgfile=${pkgname}-${pkgver}-${pkgrel}${PKGEXT}



if [ ! -f $pkgfile ]; then

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

        pkgfile=$PKGDEST/$pkgfile

	anypkgfile=$PKGDEST/$anypkgfile

        oldstylepkgfile=$PKGDEST/$oldstylepkgfile

    elif [ -f $anypkgfile ]; then

	pkgfile=$anypkgfile

	CARCH=any

    elif [ -f $oldstylepkgfile ]; then

        pkgfile=$oldstylepkgfile

    elif [ -f $PKGDEST/$anypkgfile ]; then

	pkgfile=$PKGDEST/$anypkgfile

	CARCH=any

    elif [ -f $PKGDEST/$oldstylepkgfile ]; then

        pkgfile=$PKGDEST/$oldstylepkgfile

    else

        echo "File $pkgfile doesn't exist"

        exit 1
@@ -59,8 +53,6 @@ elif [ "$cmd" == "corepkg" ]; then 
    repo="core"

elif [ "$cmd" == "testingpkg" ]; then

    repo="testing"

elif [ "$cmd" == "unstablepkg" ]; then

    repo="unstable"

elif [ "$cmd" == "communitypkg" ]; then

    repo="community"

    server="aur.archlinux.org"