From dd6f297e3bcf2eda01ea139f479232360f817cd0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?cat=20=C3=A6scling?=
 <11325618-aescling@users.noreply.gitlab.com>
Date: Thu, 3 Aug 2023 10:31:50 -0400
Subject: [PATCH] build-in-musl-chroot: fix: Fix install; make resilient

this exact problem with `${CHROOT}` vs `"${CHROOT}"` is exactly what
execline intends to solve
---
 dependencies/build-in-musl-chroot.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/dependencies/build-in-musl-chroot.sh b/dependencies/build-in-musl-chroot.sh
index 980ed90..4bb11f9 100644
--- a/dependencies/build-in-musl-chroot.sh
+++ b/dependencies/build-in-musl-chroot.sh
@@ -31,24 +31,24 @@ CHROOT=xbps/_root
 # prepare chroot
 for D in /var/db/xbps/keys /etc /proc /sys /dev /run;
 do
-	mkdir -p ${CHROOT}${D}
+	mkdir -p "${CHROOT}"${D}
 done
-cp -Lr /etc/hosts /etc/resolv.conf ${CHROOT}/etc
-cp -r build.sh _9base _toybox ${CHROOT}
+cp -Lr /etc/hosts /etc/resolv.conf "${CHROOT}"/etc
+cp -r build.sh _9base _toybox "${CHROOT}"
 
 # install into chroot
 (
 	cd xbps
 	curl -Ss "${XBPS_STATIC}" | unxz -c | tar -xf -
 )
-XBPS_ARCH=${ARCH}-musl ./xbps/usr/bin/xbps-install -y -S -r ${CHROOT} \
+XBPS_ARCH=${ARCH}-musl ./xbps/usr/bin/xbps-install -y -S -r "${CHROOT}" \
        	-R ${XBPS_REPOSITORY} \
 		base-voidstrap base-devel git
 
 unmount() {
 	for D in /proc /sys /dev /run
 	do
-		umount ${CHROOT}${D}
+		umount "${CHROOT}"${D}
 	done
 }
 
@@ -57,14 +57,14 @@ unmount() {
 # TODO: this behavior is strange
 trap unmount INT TERM EXIT
 
-mount -t proc none ${CHROOT}/proc
-mount -t sysfs none ${CHROOT}/sys
-mount --rbind /dev ${CHROOT}/dev
-mount --rbind /run ${CHROOT}/run
+mount -t proc none "${CHROOT}"/proc
+mount -t sysfs none "${CHROOT}"/sys
+mount --rbind /dev "${CHROOT}"/dev
+mount --rbind /run "${CHROOT}"/run
 
-chroot ${CHROOT} /build.sh
+chroot "${CHROOT}" /build.sh
 
 unmount
 
 # intsall
-cp -fv $(find -type f "${PREFIX}"/bin) "${HTTPD_EXECLINE_ROOT}"/binaries
\ No newline at end of file
+cp -fv $(find -type f "${CHROOT}"/_build/bin) "${HTTPD_EXECLINE_ROOT}"/binaries
\ No newline at end of file
-- 
2.47.3