summaryrefslogtreecommitdiff
path: root/extrapkg
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-10-01 23:05:18 -0500
committerDan McGee <dpmcgee@gmail.com>2007-10-01 23:06:38 -0500
commit05d0bb6fcc284c302320272a7901084fea087b15 (patch)
treebb87a4605da7b632a457352086b7efa3d147f49f /extrapkg
parentd7e3a3ed63042802e4b36d949b48d7a668d59968 (diff)
Updates for makepkg3 and current -> core change
Taken from makepkg3.patch that was in the PKGBUILD tree. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'extrapkg')
-rwxr-xr-xextrapkg29
1 files changed, 20 insertions, 9 deletions
diff --git a/extrapkg b/extrapkg
index 4821167..58c6095 100755
--- a/extrapkg
+++ b/extrapkg
@@ -10,22 +10,28 @@ if [ ! -f PKGBUILD ]; then
fi
source PKGBUILD
-pkgfile=${pkgname}-${pkgver}-${pkgrel}.pkg.tar.gz
+pkgfile=${pkgname}-${pkgver}-${pkgrel}-${CARCH}.pkg.tar.gz
+oldstylepkgfile=${pkgname}-${pkgver}-${pkgrel}.pkg.tar.gz
if [ ! -f $pkgfile ]; then
- pkgfile=$PKGDEST/$pkgfile
-fi
-
-if [ ! -f $pkgfile ]; then
- echo "File $pkgfile doesn't exist"
- exit 1
+ if [ -f $PKGDEST/$pkgfile ]; then
+ pkgfile=$PKGDEST/$pkgfile
+ oldstylepkgfile=$PKGDEST/$oldstylepkgfile
+ elif [ -f $oldstylepkgfile ]; then
+ pkgfile=$oldstylepkgfile
+ elif [ -f $PKGDEST/$oldstylepkgfile ]; then
+ pkgfile=$PKGDEST/$oldstylepkgfile
+ else
+ echo "File $pkgfile doesn't exist"
+ exit 1
+ fi
fi
if [ "$cmd" == "extrapkg" ]; then
repo="extra"
tag="CURRENT"
-elif [ "$cmd" == "currentpkg" ]; then
- repo="arch"
+elif [ "$cmd" == "corepkg" ]; then
+ repo="core"
tag="CURRENT"
elif [ "$cmd" == "testingpkg" ]; then
repo="testing"
@@ -45,6 +51,11 @@ else
echo "Must configure tupkg via ~/.tupkg, cancelled"
exit 1
fi
+ if [ "$(basename $pkgfile)" != "$(basename $oldstylepkgfile)" ]; then
+ echo "Renaming makepkg3 package for compatability"
+ mv $pkgfile $oldstylepkgfile
+ pkgfile=$oldstylepkgfile
+ fi
tupkg $pkgfile
fi
if [ $? -ne 0 ]; then