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 --- convert-to-any | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'convert-to-any') diff --git a/convert-to-any b/convert-to-any index 3d55830..5b72aab 100755 --- a/convert-to-any +++ b/convert-to-any @@ -18,9 +18,8 @@ fi if [ -f /etc/makepkg.conf ]; then . /etc/makepkg.conf else - echo "W: /etc/makepkg.conf does not exist." - DB_COMPRESSION=gz - PKGEXT=".pkg.tar.gz" + echo "E: /etc/makepkg.conf does not exist." + exit 1 fi cleanup() { @@ -57,13 +56,13 @@ pushd "$WORKDIR/build" >/dev/null # Conversion of i686 package into "any" package. mkdir -p package -if ! fakeroot tar zxf "$pkg" -C package; then +if ! fakeroot bsdtar zxf "$pkg" -C package; then die "convert-to-any: error in extracting $oldpkgname" fi sed -i "s/arch = \(i686\|x86_64\)/arch = any/g" package/.PKGINFO pushd package >/dev/null -fakeroot tar czf "$OUTDIR/$newpkgname" .PKGINFO * +fakeroot bsdtar czf "$OUTDIR/$newpkgname" .PKGINFO * popd >/dev/null popd >/dev/null -- cgit v1.2.3-54-g00ecf