diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2009-05-13 10:01:13 +0200 |
|---|---|---|
| committer | Aaron Griffin <aaronmgriffin@gmail.com> | 2009-05-13 18:41:44 +0200 |
| commit | 5dbb964d6614d7157fbedb27f7dff3c97482039a (patch) | |
| tree | af17c9b01994c7c219d3d53ac7974d038b151919 /makechrootpkg | |
| parent | 1401d5711527561ba93fd4805f81edbdd07a96e4 (diff) | |
| download | devtools-5dbb964d6614d7157fbedb27f7dff3c97482039a.tar.gz devtools-5dbb964d6614d7157fbedb27f7dff3c97482039a.tar.xz | |
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>
Diffstat (limited to 'makechrootpkg')
| -rwxr-xr-x | makechrootpkg | 6 |
1 files changed, 3 insertions, 3 deletions
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 |