massive overhaul

2-user.sh

@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-echo -ne "
--------------------------------------------------------------------------
-   █████╗ ██████╗  ██████╗██╗  ██╗████████╗██╗████████╗██╗   ██╗███████╗
-  ██╔══██╗██╔══██╗██╔════╝██║  ██║╚══██╔══╝██║╚══██╔══╝██║   ██║██╔════╝
-  ███████║██████╔╝██║     ███████║   ██║   ██║   ██║   ██║   ██║███████╗
-  ██╔══██║██╔══██╗██║     ██╔══██║   ██║   ██║   ██║   ██║   ██║╚════██║
-  ██║  ██║██║  ██║╚██████╗██║  ██║   ██║   ██║   ██║   ╚██████╔╝███████║
-  ╚═╝  ╚═╝╚═╝  ╚═╝ ╚═════╝╚═╝  ╚═╝   ╚═╝   ╚═╝   ╚═╝    ╚═════╝ ╚══════╝
--------------------------------------------------------------------------
-                    Automated Arch Linux Installer
-                        SCRIPTHOME: ArchTitus
--------------------------------------------------------------------------
-
-Installing AUR Softwares
-"
-# You can solve users running this script as root with this and then doing the same for the next for statement. However I will leave this up to you.
-source $HOME/ArchTitus/setup.conf
-
-cd ~
-git clone "https://aur.archlinux.org/yay.git"
-cd ~/yay
-makepkg -si --noconfirm
-cd ~
-touch "~/.cache/zshhistory"
-git clone "https://github.com/ChrisTitusTech/zsh"
-git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ~/powerlevel10k
-ln -s "~/zsh/.zshrc" ~/.zshrc
-
-yay -S --noconfirm --needed - < ~/ArchTitus/pkg-files/aur-pkgs.txt
-
-export PATH=$PATH:~/.local/bin
-cp -r ~/ArchTitus/dotfiles/* ~/.config/
-pip install konsave
-konsave -i ~/ArchTitus/kde.knsv
-sleep 1
-konsave -a kde
-
-echo -ne "
--------------------------------------------------------------------------
-                    SYSTEM READY FOR 3-post-setup.sh
--------------------------------------------------------------------------
-"
-exit

archtitus.sh

@@ -1,8 +1,11 @@
 #!/bin/bash
 
 # Find the name of the folder the scripts are in
-setfont ter-v22b
+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 "
 -------------------------------------------------------------------------
    █████╗ ██████╗  ██████╗██╗  ██╗████████╗██╗████████╗██╗   ██╗███████╗
@@ -16,17 +19,16 @@ echo -ne "
 -------------------------------------------------------------------------
                 Scripts are in directory named ArchTitus
 "
-#!/bin/bash
+    ( bash $SCRIPT_DIR/scripts/startup.sh )|& tee startup.log
-if awk -F/ '$2 == "docker"' /proc/self/cgroup | read; then
+      source $CONFIGS_DIR/setup.conf
-    echo -ne "docker container found script can't install (at the moment)"
+    ( bash $SCRIPT_DIR/scripts/0-preinstall.sh )|& tee 0-preinstall.log
-else
+    ( arch-chroot /mnt $HOME/ArchTitus/scripts/1-setup.sh )|& tee 1-setup.log
-    bash startup.sh
+    if [[ ! $DESKTOP_ENV == server ]]; then
-    source $SCRIPT_DIR/setup.conf
+      ( arch-chroot /mnt /usr/bin/runuser -u $USERNAME -- /home/$USERNAME/ArchTitus/scripts/2-user.sh )|& tee 2-user.log
-    bash 0-preinstall.sh
+    fi
-    arch-chroot /mnt /root/ArchTitus/1-setup.sh
+    ( arch-chroot /mnt $HOME/ArchTitus/scripts/3-post-setup.sh )|& tee 3-post-setup.log
-    arch-chroot /mnt /usr/bin/runuser -u $USERNAME -- /home/$USERNAME/ArchTitus/2-user.sh
+    cp -v *.log /mnt/home/$USERNAME
-    arch-chroot /mnt /root/ArchTitus/3-post-setup.sh
+
-fi
 echo -ne "
 -------------------------------------------------------------------------
    █████╗ ██████╗  ██████╗██╗  ██╗████████╗██╗████████╗██╗   ██╗███████╗