From c441cb782df56c507072e6b84f25b584f992b136 Mon Sep 17 00:00:00 2001
From: lemniskett <lemniskett@outlook.com>
Date: Mon, 4 Jan 2021 18:37:53 +0700
Subject: [PATCH] Redirects error messages to stderr and other fixes.

---
 archbox-desktop.bash |  2 +-
 archbox.bash         | 16 ++--------------
 chroot_setup.bash    |  2 +-
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/archbox-desktop.bash b/archbox-desktop.bash
index 7127de1..1bf72aa 100755
--- a/archbox-desktop.bash
+++ b/archbox-desktop.bash
@@ -18,7 +18,7 @@ checkdep(){
 }
 
 err(){
-    echo "$(tput bold)$(tput setaf 1)==> $@ $(tput sgr0)"
+    echo "$(tput bold)$(tput setaf 1)==> $@ $(tput sgr0)" 1>&2
     exit 1
 }
 
diff --git a/archbox.bash b/archbox.bash
index 098d47b..95cd857 100755
--- a/archbox.bash
+++ b/archbox.bash
@@ -34,7 +34,7 @@ EOF
 }
 
 err(){
-    echo "$(tput bold)$(tput setaf 1)==> $@ $(tput sgr0)"
+    echo "$(tput bold)$(tput setaf 1)==> $@ $(tput sgr0)" 1>&2
     exit 1
 }
 
@@ -65,19 +65,7 @@ case $1 in
         checkdep sed
         sed -i 's/CheckSpace/#CheckSpace/g' $CHROOT/etc/pacman.conf
         msg "Mounting necessary filesystems..."
-        mount -R /home $CHROOT/home
-        mount -t proc /proc $CHROOT/proc
-        mount -R /tmp $CHROOT/tmp
-        mount -R /sys $CHROOT/sys
-        mount -R /dev $CHROOT/dev
-        [[ $MOUNT_RUN = "yes" ]] && mount -R /run $CHROOT/run
-        mount --make-rslave $CHROOT/dev
-        mount --make-rslave $CHROOT/sys
-        mkdir -p $CHROOT/var/lib/dbus
-        mount -R /var/lib/dbus $CHROOT/var/lib/dbus
-        mkdir -p $CHROOT/lib/modules
-        mount -R /lib/modules $CHROOT/lib/modules
-        mount -R /boot $CHROOT/boot
+        /usr/local/share/archbox/bin/archboxinit start
         cp /usr/local/share/archbox/chroot_setup.bash $CHROOT/chroot_setup
         echo $USER > /tmp/archbox_user
         chroot $CHROOT /bin/bash -c "/chroot_setup"
diff --git a/chroot_setup.bash b/chroot_setup.bash
index f49bc77..e7d38de 100755
--- a/chroot_setup.bash
+++ b/chroot_setup.bash
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 err(){
-    echo "$(tput bold)$(tput setaf 1)==> $@ $(tput sgr0)"
+    echo "$(tput bold)$(tput setaf 1)==> $@ $(tput sgr0)" 1>&2
     exit 1
 }