From 218bb28bad79011b4748ccae830b7ba67a9e8d13 Mon Sep 17 00:00:00 2001
From: mfgbhatti <mfgbhatti@live.com>
Date: Sat, 19 Feb 2022 18:59:07 +0000
Subject: [PATCH] updates

---
 2-user.sh    | 16 ++++++++--------
 archtitus.sh |  9 ++++-----
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/2-user.sh b/2-user.sh
index d6c7702..ab9882f 100755
--- a/2-user.sh
+++ b/2-user.sh
@@ -22,18 +22,18 @@ install_aur() {
 cd "$HOME" || exit 0
 case "$AURHELPER" in
 "yay")
-    install_pkg "go"
+    # install_pkg "go" permission error
     git clone "https://aur.archlinux.org/yay.git"
     ;;
 "trizen")
-    install_pkg "perl"
+    # install_pkg "perl"
     git clone "https://aur.archlinux.org/trizen.git"
     ;;
 "aurman")
     git clone "https://aur.archlinux.org/aurman.git"
     ;;
 "aura")
-    install_pkg "stack"
+    # install_pkg "stack"
     git clone "https://aur.archlinux.org/aura.git"
     ;;
 "pikaur")
@@ -55,11 +55,6 @@ if [[ "$LAYOUT" -eq 1 ]]; then
             install_aur "$LINE"
     done <~/ArchTitus/pkg-files/aur-pkgs.txt
 
-    touch "$HOME/.cache/zshhistory"
-    git clone "https://github.com/ChrisTitusTech/zsh"
-    git clone --depth=1 "https://github.com/romkatv/powerlevel10k.git" "$HOME"/powerlevel10k
-    ln -s "$HOME/zsh/.zshrc" "$HOME"/.zshrc
-
     pip install konsave
     konsave -i "$HOME"/ArchTitus/kde.knsv
     sleep 1
@@ -67,6 +62,11 @@ if [[ "$LAYOUT" -eq 1 ]]; then
     cp -r "$HOME"/ArchTitus/dotfiles/* "$HOME"/.config/
 fi
 
+touch "$HOME/.cache/zshhistory"
+git clone "https://github.com/ChrisTitusTech/zsh"
+git clone --depth=1 "https://github.com/romkatv/powerlevel10k.git" "$HOME"/powerlevel10k
+ln -s "$HOME/zsh/.zshrc" "$HOME"/.zshrc
+
 case "$DESKTOP" in
 "lxqt")
     install_aur sddm-nordic-theme-git
diff --git a/archtitus.sh b/archtitus.sh
index 54bf148..6caf27a 100755
--- a/archtitus.sh
+++ b/archtitus.sh
@@ -41,7 +41,7 @@ do_reboot () {
 }
 
 end() {
-    logo
+    REBOOT="true"
     for (( i = 15; i >= 1; i-- )); do
         read -r -s -n 1 -t 1 -p "Rebooting in $i seconds... Press Esc key to abort or press R key to reboot now."$'\n' KEY
         CODE="$?"
@@ -49,15 +49,14 @@ end() {
             continue
         fi
         if [[ "$KEY" == $'\e' ]]; then
-            REBOOT=0
+            REBOOT="false"
             break
         elif [[ "$KEY" == "r" || "$KEY" == "R" ]]; then
-            REBOOT=1
+            REBOOT="true"
             break
         fi
-        REBOOT=1
     done
-    if [[ "$REBOOT" -eq 1 ]]; then
+    if [[ "$REBOOT" == "true" ]]; then
         do_reboot
     else
         echo "Reboot is aborted "