From db779acfe1319f7cdbdc0c493f6e6fd6ae2412ef Mon Sep 17 00:00:00 2001 From: merakor Date: Fri, 24 Jul 2020 10:39:50 +0000 Subject: contrib: replace kiss usage with cpt tools FossilOrigin-Name: 37f8991b3fe9af32f167b813e0a1a30ada525aa3e3f31507a267c7c3ba5f43b7 --- contrib/cpt-chbuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'contrib/cpt-chbuild') diff --git a/contrib/cpt-chbuild b/contrib/cpt-chbuild index 3ee7c42..bfbbcd2 100755 --- a/contrib/cpt-chbuild +++ b/contrib/cpt-chbuild @@ -10,7 +10,7 @@ die() { rm -f carbs-rootfs.tar.xz carbs-rootfs.tar.xz.sum log "$@" - log "Re-run 'kiss-chbuild' to try again." + log "Re-run 'cpt-chbuild' to try again." exit 1 } @@ -37,7 +37,7 @@ case "$(uname -m)" in i*86) arch=i686; esac url="https://dl.carbslinux.org/releases/${arch:-$(uname -m)}/carbs-rootfs.tar.xz" pid=$$ -cd "${cac_dir:=$KISS_ROOT${XDG_CACHE_HOME:-$HOME/.cache}/kiss}" +cd "${cac_dir:=$CPT_ROOT${CPT_CACHE:=${XDG_CACHE_HOME:-$HOME/.cache}/cpt}}" [ -f carbs-rootfs.tar.xz ] || { log "Downloading chroot tarball" @@ -66,8 +66,8 @@ cp -a carbs-chroot "chroot-$pid" [ "$1" ] && { log "Installing extra packages" - KISS_ROOT=$PWD/chroot-$pid kiss i "$@" + CPT_ROOT=$PWD/chroot-$pid cpt-install "$@" } log "Entering chroot" -su -c "kiss-chroot chroot-$pid; rm -rf chroot-$pid" +su -c "cpt-chroot chroot-$pid; rm -rf chroot-$pid" -- cgit v1.2.3