From a1ea353e62662905b91b438bdf76b77610ae09d5 Mon Sep 17 00:00:00 2001 From: merakor Date: Sat, 3 Jul 2021 00:54:29 +0000 Subject: cpt-chbuild: use pax instead of tar FossilOrigin-Name: dcd61e81138a596c53b2f1f08a9cc53646375ea39aec69228bb7182e4397c881 --- contrib/cpt-chbuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/cpt-chbuild b/contrib/cpt-chbuild index e53d903..a58d2ee 100755 --- a/contrib/cpt-chbuild +++ b/contrib/cpt-chbuild @@ -34,7 +34,7 @@ die() { case "$(uname -m)" in i*86) arch=i686; esac url="https://dl.carbslinux.org/releases/${arch:-$(uname -m)}/carbs-rootfs.tar.xz" -cd "$cac_dir" +cd "${cac_dir:?}" [ -f carbs-rootfs.tar.xz ] || { log "Downloading chroot tarball" @@ -55,10 +55,10 @@ sh256 carbs-rootfs.tar.xz | diff - carbs-rootfs.tar.xz.sum || [ -d carbs-chroot ] || { log "Extracting chroot" mkdir -p carbs-chroot - ( cd carbs-chroot; tar xf ../carbs-rootfs.tar.xz ) + (cd carbs-chroot; xz -cd ../carbs-rootfs.tar.xz | pax -r) } -create_cache empty +mkdir -p "${tmp_dir:?}" log "Creating temporary chroot" cp -a carbs-chroot "${chr_dir:=$tmp_dir/chroot}" -- cgit v1.2.3