From c21a48ff9afa9e4efd7b4fa1bf132dc9f252a9f2 Mon Sep 17 00:00:00 2001
From: Stephan Raabe <mail@stephan-raabe.de>
Date: Wed, 12 Apr 2023 12:27:35 +0200
Subject: [PATCH] Updates

---
 1-install.sh | 76 +++++++++++++++++++++++++++++++++++++++-------------
 2-qtile.sh   | 32 +++++++++++++++++++---
 2 files changed, 85 insertions(+), 23 deletions(-)

diff --git a/1-install.sh b/1-install.sh
index ad1d11d..bc021e1 100755
--- a/1-install.sh
+++ b/1-install.sh
@@ -11,9 +11,32 @@
 # yay must be installed
 # ------------------------------------------------------
 
+# ------------------------------------------------------
+# Confirm Start
+# ------------------------------------------------------
 clear
-echo "DO YOU WANT TO START THE INSTALLATION NOW?"
-read -p "(Return to start, Ctrl+c to cancel)" c
+echo "     _       _    __ _ _            "
+echo "  __| | ___ | |_ / _(_) | ___  ___  "
+echo " / _' |/ _ \| __| |_| | |/ _ \/ __| "
+echo "| (_| | (_) | |_|  _| | |  __/\__ \ "
+echo " \__,_|\___/ \__|_| |_|_|\___||___/ "
+echo "                                    "
+echo "by Stephan Raabe (2023)"
+echo "-------------------------------------"
+echo ""
+
+while true; do
+    read -p "DO YOU WANT TO START THE INSTALLATION NOW? (Yy/Nn): " yn
+    case $yn in
+        [Yy]* )
+            echo "Installation started."
+        break;;
+        [Nn]* ) 
+            exit;
+        break;;
+        * ) echo "Please answer yes or no.";;
+    esac
+done
 
 # ------------------------------------------------------
 # Install required packages
@@ -147,10 +170,10 @@ echo ""
 echo "-> Install .config folder"
 
 if [ -d ~/.config ]; then
-    echo ".config folder already exists"
+    echo ".config folder already exists."
 else
     mkdir ~/.config
-    echo ".config folder created"
+    echo ".config folder created."
 fi
 
 # ------------------------------------------------------
@@ -164,16 +187,16 @@ _installSymLink() {
     linksource="$2";
     linktarget="$3";
     if [ -L "${symlink}" ]; then
-        echo "Link ${symlink} exists already!"
+        echo "Link ${symlink} exists already."
     else
         if [ -d ${symlink} ]; then
-            echo "Directory ${symlink}/ exists"
+            echo "Directory ${symlink}/ exists."
         else
             if [ -f ${symlink} ]; then
-                echo "File ${symlink} exists"
+                echo "File ${symlink} exists."
             else
                 ln -s ${linksource} ${linktarget} 
-                echo "Link ${linksource} -> ${linktarget} created"
+                echo "Link ${linksource} -> ${linktarget} created."
             fi
         fi
     fi
@@ -207,26 +230,41 @@ _installSymLink ~/.icons ~/dotfiles/.icons/ ~/
 echo ""
 echo "-> Install wallpapers"
 if [ -d ~/wallpaper/ ]; then
-    echo "wallpaper folder already exists"
+    echo "wallpaper folder already exists."
 else
     git clone https://gitlab.com/stephan-raabe/wallpaper.git ~/wallpaper
-    echo "wallpaper installed"
+    echo "wallpaper installed."
 fi
 
-# ------------------------------------------------------
-# Install custom issue (login prompt)
-# ------------------------------------------------------
-echo ""
-echo "-> Install login screen"
-sudo cp ~/dotfiles/issue /etc/issue
-echo "Login screen installed"
-
 # ------------------------------------------------------
 # Init pywal
 # ------------------------------------------------------
 echo ""
 echo "-> Init pywal"
 wal -i ~/wallpaper/default.jpg -n
-echo "pywal initiated"
+echo "pywal initiated."
+
+# ------------------------------------------------------
+# Install custom issue (login prompt)
+# ------------------------------------------------------
+echo ""
+echo "-> Install login screen"
+while true; do
+    read -p "Do you want to install the custom login promt? (Yy/Nn): " yn
+    case $yn in
+        [Yy]* )
+            sudo cp ~/dotfiles/issue /etc/issue
+            echo "Login promt installed."
+        break;;
+        [Nn]* ) 
+            echo "Custom login promt skipped."
+        break;;
+        * ) echo "Please answer yes or no.";;
+    esac
+done
+
+# ------------------------------------------------------
+# DONE
+# ------------------------------------------------------
 echo ""
 echo "DONE! Reboot suggested..."
diff --git a/2-qtile.sh b/2-qtile.sh
index 1987828..014da59 100755
--- a/2-qtile.sh
+++ b/2-qtile.sh
@@ -8,11 +8,35 @@
 # by Stephan Raabe (2023)
 # ------------------------------------------------------
 # Install Script for Qtile
-# yay must be installed
 # ------------------------------------------------------
 
-read -p "Do you want to start? " s
-echo "START QTILE INSTALLATION..."
+# ------------------------------------------------------
+# Confirm Start
+# ------------------------------------------------------
+clear
+echo "  ___ _____ ___ _     _____  "
+echo " / _ \_   _|_ _| |   | ____| "     
+echo "| | | || |  | || |   |  _|   "
+echo "| |_| || |  | || |___| |___  "
+echo " \__\_\|_| |___|_____|_____| "
+echo "                             " 
+echo "by Stephan Raabe (2023)"
+echo "------------------------------------------------------"
+echo ""
+
+while true; do
+    read -p "DO YOU WANT TO START THE INSTALLATION NOW? (Yy/Nn): " yn
+    case $yn in
+        [Yy]* )
+            echo "Installation started."
+        break;;
+        [Nn]* ) 
+            exit;
+        break;;
+        * ) echo "Please answer yes or no.";;
+    esac
+done
+echo ""
 
 # ------------------------------------------------------
 # Install required packages
@@ -23,7 +47,7 @@ sudo pacman -S qtile
 # ------------------------------------------------------
 # Create symbolic links
 # ------------------------------------------------------
-echo "-> Create symbolic links"
+echo "-> Create symbolic link for startx"
 rm ~/.xinitrc
 ln -s ~/dotfiles/qtile/.xinitrc ~/.xinitrc