summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-01-13 19:27:17 +0100
committerDan McGee <dan@archlinux.org>2008-01-13 19:27:17 +0100
commit521de7ceedc6e4f5df52c0380f536a6f13a7f578 (patch)
tree1b6d86158a19b3156c23cb81ee90f291ca85f9b3 /scripts
parent4f267017936471c8248a85f8d86aabb96e66c7e8 (diff)
parentbbe02ec57fd56670dfe0bc08d981ce8a1aa31370 (diff)
downloadpacman-521de7ceedc6e4f5df52c0380f536a6f13a7f578.tar.gz
pacman-521de7ceedc6e4f5df52c0380f536a6f13a7f578.tar.xz
Merge branch 'maint'
Diffstat (limited to 'scripts')
-rw-r--r--scripts/gensync.sh.in6
-rw-r--r--scripts/updatesync.sh.in4
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/gensync.sh.in b/scripts/gensync.sh.in
index b49c26ee..04f80022 100644
--- a/scripts/gensync.sh.in
+++ b/scripts/gensync.sh.in
@@ -130,13 +130,13 @@ for file in $(find "$rootdir"/* -name "$BUILDSCRIPT"); do
CARCH='any'
fi
if [ "$pkgdir" != "" ]; then
- pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT"
+ pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-${CARCH}${PKGEXT}"
else
- pkgfile="$destdir/$pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT"
+ pkgfile="$destdir/$pkgname-$pkgver-$pkgrel-${CARCH}${PKGEXT}"
fi
if [ ! -f "$pkgfile" ]; then
- error "$(gettext "could not find %s-%s-%s-%s.%s - skipping")" $pkgname $pkgver $pkgrel $CARCH $PKGEXT
+ error "$(gettext "could not find %s-%s-%s-%s%s - skipping")" $pkgname $pkgver $pkgrel $CARCH $PKGEXT
else
if check_force; then
forcepkgs="$forcepkgs $pkgfile"
diff --git a/scripts/updatesync.sh.in b/scripts/updatesync.sh.in
index 2e47ac94..900f11f3 100644
--- a/scripts/updatesync.sh.in
+++ b/scripts/updatesync.sh.in
@@ -127,10 +127,10 @@ if [ "$action" = "upd" ]; then # INSERT / UPDATE
if [ "$arch" = 'any' ]; then
CARCH='any'
fi
- pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT"
+ pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-${CARCH}${PKGEXT}"
if [ ! -f "$pkgfile" ]; then
- die "$(gettext "could not find %s-%s-%s-%s.%s - aborting")" $pkgname $pkgver $pkgrel $CARCH $PKGEXT
+ die "$(gettext "could not find %s-%s-%s-%s%s - aborting")" $pkgname $pkgver $pkgrel $CARCH $PKGEXT
fi
if check_force; then