summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2009-09-01 22:23:25 +1000
committerAllan McRae <allan@archlinux.org>2009-09-01 22:23:25 +1000
commit30aab9b93655fa42e3e99c3390c1dfbece37d76f (patch)
treecda82abbced8230033c5c8e1739856ee02b91d80
parentd8d0c876140e1ca74f22238fc3cfca7947cd249e (diff)
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: Eric BĂ©langer <eric@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
-rwxr-xr-xcommitpkg10
1 files changed, 1 insertions, 9 deletions
diff --git a/commitpkg b/commitpkg
index 43d9cf2..a7078e7 100755
--- a/commitpkg
+++ b/commitpkg
@@ -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"