From 056aac864aaa989a17703857e8e0e9b67726fc22 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 7 Dec 2012 12:24:18 -0500 Subject: Improve chcleanup, make supporting changes to other tools chcleanup: * load `CHROOTEXTRAPKGS` from `/etc/libretools.d/chroot.conf` * always cleanup temporary files * properly quote the various arrays used * verify that you are in a chroot librechroot: * write `$copydir/etc/libretools.d/chroot.conf` libremakepkg.gpl2: * use `librechroot` instead of `archroot` directly in `chrootexec()` --- src/chroot-tools/librechroot | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/chroot-tools/librechroot') diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot index 0a7ba65..52a3bdf 100755 --- a/src/chroot-tools/librechroot +++ b/src/chroot-tools/librechroot @@ -116,6 +116,17 @@ main() { sync fi + mkdir -p $copydir/etc/libretools.d + { + if [[ -n ${CHROOTEXTRAPKG[@]:-} ]]; then + printf 'CHROOTEXTRAPKG=(' + printf "'%s' " "${CHROOTEXTRAPKG[@]}" + printf ')\n' + else + printf 'CHROOTEXTRAPKG=()\n' + fi + } > $copydir/etc/libretools.d/chroot.conf + ######################################################################## trap cleanup EXIT -- cgit v1.2.2