diff options
| author | Travis Willard <travis@archlinux.org> | 2008-01-13 07:42:40 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-01-13 12:21:36 -0600 |
| commit | bbe02ec57fd56670dfe0bc08d981ce8a1aa31370 (patch) | |
| tree | 00b41ee422623de00daba06ab050c8b23d56d35c | |
| parent | 47e8dd0670f14ae2a1efe25fc920d1d46cdec586 (diff) | |
| download | pacman-bbe02ec57fd56670dfe0bc08d981ce8a1aa31370.tar.xz | |
Update Gensync and Updatesync to use new PKGEXT variable
Previously, this caused both scripts to look for
pkgname-pkgver-pkgrel-arch..pkg.tar.gz - extra period has been removed.
Fixes FS#9190.
Signed-off-by: Travis Willard <travis@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | scripts/gensync.sh.in | 6 | ||||
| -rw-r--r-- | scripts/updatesync.sh.in | 4 |
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 |