Reorganize solution

archtitus.sh

@@ -1,7 +1,11 @@
 #!/bin/bash
 
 # Find the name of the folder the scripts are in
+set -a
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+SCRIPTS_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"/scripts
+CONFIGS_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"/configs
+set +a
 echo -ne "
 -------------------------------------------------------------------------
    █████╗ ██████╗  ██████╗██╗  ██╗████████╗██╗████████╗██╗   ██╗███████╗
@@ -15,14 +19,14 @@ echo -ne "
 -------------------------------------------------------------------------
                 Scripts are in directory named ArchTitus
 "
-    ( bash startup.sh )|& tee startup.log
+    ( bash $SCRIPT_DIR/scripts/startup.sh )|& tee startup.log
-    source $SCRIPT_DIR/setup.conf
+      source $SCRIPT_DIR/configs/setup.conf
-    ( bash 0-preinstall.sh )|& tee 0-preinstall.log
+    ( bash $SCRIPT_DIR/scripts/0-preinstall.sh )|& tee 0-preinstall.log
-    ( arch-chroot /mnt /root/ArchTitus/1-setup.sh )|& tee 1-setup.log
+    ( arch-chroot /mnt /root/ArchTitus/scripts/1-setup.sh )|& tee 1-setup.log
     if [[ ! $DESKTOP_ENV == server ]]; then
-      ( arch-chroot /mnt /usr/bin/runuser -u $USERNAME -- /home/$USERNAME/ArchTitus/2-user.sh )|& tee 2-user.log
+      ( arch-chroot /mnt /usr/bin/runuser -u $USERNAME -- /home/$USERNAME/ArchTitus/scripts/2-user.sh )|& tee 2-user.log
     fi
-    ( arch-chroot /mnt /root/ArchTitus/3-post-setup.sh )|& tee 3-post-setup.log
+    ( arch-chroot /mnt /root/ArchTitus/scripts/3-post-setup.sh )|& tee 3-post-setup.log
 
 echo -ne "
 -------------------------------------------------------------------------