Use $PKGEXT defined in makepkg.conf

Also replace some uses of tar with bsdtar

Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>

3 files changed, 10 insertions, 10 deletions

diff --git a/checkpkg b/checkpkg
index d132e0c..ec181bd 100755
--- a/checkpkg
+++ b/checkpkg
@@ -24,8 +24,8 @@ fi
 
 source PKGBUILD
 
-pkgfile=${pkgname}-${pkgver}-${pkgrel}-${CARCH}.pkg.tar.gz
-oldstylepkgfile=${pkgname}-${pkgver}-${pkgrel}.pkg.tar.gz
+pkgfile=${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
+oldstylepkgfile=${pkgname}-${pkgver}-${pkgrel}${PKGEXT}
 
 if [ -f "$(pwd)/$pkgfile" ]; then
     pkgfile=$(pwd)/$pkgfile
@@ -64,8 +64,8 @@ if [ ! -f $oldpkg ]; then
 	fi
 fi
 
-tar tzf $oldpkg > filelist-old
-tar tzf "$pkgfile" > filelist
+bsdtar tf $oldpkg > filelist-old
+bsdtar tf "$pkgfile" > filelist
 
 sort -o filelist filelist
 sort -o filelist-old filelist-old
@@ -75,7 +75,7 @@ diff filelist-old filelist
 if diff filelist-old filelist | grep '\.so\.' > /dev/null 2>&1; then
 	mkdir -p pkg
 	cd pkg
-	tar xzf "$pkgfile" > /dev/null
+	bsdtar xf "$pkgfile" > /dev/null
 	for i in `diff ../filelist-old ../filelist | grep \> | grep \.so\. | awk '{print $2}'`; do
 		echo -n "${i}: "
 		objdump -p $i | grep SONAME
diff --git a/commitpkg b/commitpkg
index 8f4d37d..79998fb 100755
--- a/commitpkg
+++ b/commitpkg
@@ -26,8 +26,8 @@ if [ -z "$CARCH" ]; then
 fi
 
 source PKGBUILD
-pkgfile=${pkgname}-${pkgver}-${pkgrel}-${CARCH}.pkg.tar.gz
-oldstylepkgfile=${pkgname}-${pkgver}-${pkgrel}.pkg.tar.gz
+pkgfile=${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
+oldstylepkgfile=${pkgname}-${pkgver}-${pkgrel}${PKGEXT}
 
 if [ ! -f $pkgfile ]; then
     if [ -f $PKGDEST/$pkgfile ]; then
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