From c076b93fafbf47a85bd063c626621552f364a59d Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Wed, 13 May 2009 11:06:06 +0200 Subject: use pkgext defined in makepkg.conf Signed-off-by: Pierre Schmitz Signed-off-by: Aaron Griffin --- misc-scripts/find-dupes | 4 ++-- misc-scripts/ftpdir-cleanup | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'misc-scripts') diff --git a/misc-scripts/find-dupes b/misc-scripts/find-dupes index 372108f..16bf530 100755 --- a/misc-scripts/find-dupes +++ b/misc-scripts/find-dupes @@ -39,7 +39,7 @@ getpkgname() { showdupes() { done="" - for i in *.pkg.tar.gz; do + for i in *${PKGEXT}; do pkgname=$(getpkgname $i) if [ "$pkgname" = "$1" ]; then lastmod="$(stat -c %y $i | cut -d. -f1)" @@ -60,7 +60,7 @@ echo "Scanning for duplicate packages in '$reponame' ($arch)" DUPES="" lastpkg="" -for pkg in *.pkg.tar.gz; do +for pkg in *${PKGEXT}; do pkgname="$(getpkgname $pkg)" if [ "$lastpkg" = "$pkgname" ]; then DUPES="$DUPES $pkgname" diff --git a/misc-scripts/ftpdir-cleanup b/misc-scripts/ftpdir-cleanup index ed90437..a87ed8f 100755 --- a/misc-scripts/ftpdir-cleanup +++ b/misc-scripts/ftpdir-cleanup @@ -49,11 +49,11 @@ EXTRAFILES="" TMPDIR=$(mktemp -d /tmp/cleanup.XXXXXX) || exit 1 cd "${TMPDIR}" -/bin/tar xzf "$ftppath/$reponame.db.tar.$DB_COMPRESSION" +bsdtar xf "$ftppath/$reponame.db.tar.$DB_COMPRESSION" for pkg in *; do filename=$(grep -A1 '^%FILENAME%$' "${pkg}/desc" | tail -n1) - [ -z "${filename}" ] && filename="${pkg}.pkg.tar.gz" + [ -z "${filename}" ] && filename="${pkg}${PKGEXT}" if [ ! -f "${ftppath}/${filename}" ]; then MISSINGFILES="${MISSINGFILES} ${filename}" -- cgit v1.2.3-2-g168b