From ae8ddc3062021dbe64420208aa977e4dbaab5aa3 Mon Sep 17 00:00:00 2001
From: godalming123 <r2hk9ahnf@relay.firefox.com>
Date: Sun, 27 Feb 2022 17:39:22 +0000
Subject: [PATCH] fix logs bug adn move source definition

---
 archtitus.sh      |  3 ++-
 scripts/2-user.sh | 15 +++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/archtitus.sh b/archtitus.sh
index 362d2e1..f2ba675 100755
--- a/archtitus.sh
+++ b/archtitus.sh
@@ -28,7 +28,8 @@ if [[ ! $DESKTOP_ENV == server ]]; then
   ( arch-chroot /mnt /usr/bin/runuser -u $USERNAME -- /home/$USERNAME/ArchTitus/scripts/2-user.sh )|& tee logs/2-user.log
 fi
 ( arch-chroot /mnt $HOME/ArchTitus/scripts/3-post-setup.sh )|& tee logs/3-post-setup.log
-cp -v *.log /mnt/home/$USERNAME
+mkdir /mnt/home/$USERNAME/installLogs
+cp -v logs/*.log /mnt/home/$USERNAME/installLogs
 
 echo -ne "
 -------------------------------------------------------------------------
diff --git a/scripts/2-user.sh b/scripts/2-user.sh
index 82b8ea4..bc53245 100755
--- a/scripts/2-user.sh
+++ b/scripts/2-user.sh
@@ -14,6 +14,7 @@ echo -ne "
 
 Installing AUR Softwares
 "
+source $HOME/ArchTitus/configs/setup.conf
 
 addAUR () {
   cd ~
@@ -39,14 +40,12 @@ installFromFile () {
   done
 }
 
-source $HOME/ArchTitus/configs/setup.conf
-
-  cd ~
-  mkdir "/home/$USERNAME/.cache"
-  touch "/home/$USERNAME/.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
+cd ~
+mkdir "/home/$USERNAME/.cache"
+touch "/home/$USERNAME/.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
 
 installFromFile ~/ArchTitus/pkg-files/${DESKTOP_ENV}.txt