From 5dbb964d6614d7157fbedb27f7dff3c97482039a Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Wed, 13 May 2009 10:01:13 +0200 Subject: Use $PKGEXT defined in makepkg.conf Also replace some uses of tar with bsdtar Signed-off-by: Pierre Schmitz Signed-off-by: Aaron Griffin --- makechrootpkg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'makechrootpkg') diff --git a/makechrootpkg b/makechrootpkg index 78601d4..8ff6024 100755 --- a/makechrootpkg +++ b/makechrootpkg @@ -214,7 +214,7 @@ export LANG=$LOCALE cd /build export HOME=/build sudo -u nobody makepkg $MAKEPKG_ARGS || touch BUILD_FAILED -which namcap 2>&1 >/dev/null && namcap *.pkg.tar.gz > /pkgdest/namcap.log +which namcap 2>&1 >/dev/null && namcap *${PKGEXT} > /pkgdest/namcap.log exit 0 EOF ) > "$uniondir/chrootbuild" @@ -223,13 +223,13 @@ chmod +x "$uniondir/chrootbuild" if mkarchroot -r "/chrootbuild" "$uniondir"; then source ${WORKDIR}/PKGBUILD - pkgfile=${chrootdir}/union/pkgdest/${pkgname}-${pkgver}-${pkgrel}-*.pkg.tar.gz + pkgfile=${chrootdir}/union/pkgdest/${pkgname}-${pkgver}-${pkgrel}-*${PKGEXT} if [ -n "$add_to_db" -a -e "$pkgfile" ]; then [ -d "${chrootdir}/union/repo" ] || mkdir -p "${chrootdir}/union/repo" pushd "${chrootdir}/union/repo" >/dev/null cp "$pkgfile" . - repo-add repo.db.tar.gz "${pkgname}-${pkgver}-${pkgrel}-*.pkg.tar.gz" + repo-add repo.db.tar.${DB_COMPRESSION} "${pkgname}-${pkgver}-${pkgrel}-*${PKGEXT}" popd >/dev/null fi -- cgit v1.2.3-24-g4f1b