From 7dd606194adbd9b723bb5ba0841958e811ba7bef Mon Sep 17 00:00:00 2001 From: Alexander Hill Date: Sun, 20 Apr 2025 05:38:45 -0400 Subject: [PATCH] Launch zsh automatically if possible --- chroot-bootstrap.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/chroot-bootstrap.sh b/chroot-bootstrap.sh index a09bbaf..5fe43d0 100755 --- a/chroot-bootstrap.sh +++ b/chroot-bootstrap.sh @@ -1,6 +1,14 @@ #!/bin/sh MAPLE=$(pwd)/maple +run_chroot() { + SHELL=/bin/sh + if [ -e $MAPLE/bin/zsh ]; then + SHELL=/bin/zsh + fi + chroot $MAPLE $SHELL +} + if mount --rbind /dev $MAPLE/dev && mount --make-rslave $MAPLE/dev; then if mount -t proc /proc $MAPLE/proc; then if mount --rbind /sys $MAPLE/sys && mount --make-rslave $MAPLE/sys; then @@ -8,11 +16,11 @@ if mount --rbind /dev $MAPLE/dev && mount --make-rslave $MAPLE/dev; then if mount --bind /run $MAPLE/run; then if [ -d $MAPLE/maple/sources ]; then if mount --bind ./sources $MAPLE/maple/sources; then - chroot $MAPLE /bin/sh + run_chroot umount $MAPLE/maple/sources fi else - chroot $MAPLE /bin/sh + run_chroot fi umount $MAPLE/run fi