From 09cdd4fc5c920e85ec27cb1923e266d2b3e72ee1 Mon Sep 17 00:00:00 2001
From: Jane Doe <ifeelsosecurenow@gmail.com>
Date: Sun, 30 Nov 2025 20:27:41 +0200
Subject: [PATCH] Change: Prompts have been edited for aesthetic reasons

---
 Amelia.sh | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/Amelia.sh b/Amelia.sh
index fc6319e..c7e2328 100644
--- a/Amelia.sh
+++ b/Amelia.sh
@@ -2,7 +2,7 @@
 
 # Amelia Installer
 # Source: https://gitlab.com/prism7/archery
-# Version: 1.1.2
+# Version: 1.1.3
 
         set -euo pipefail
 ###################################################################################################
@@ -2446,6 +2446,10 @@ Enter a number ${bwhite}(empty to skip)${blue}: "
                 invalid
                 return 1 ;;
         esac
+
+        if [[ "${web}" =~ ^(4|5|6|7|8|9)$ && -z "${devel}" ]]; then
+            validpkgs+=(base-devel)
+        fi
     else
         sleep 0.2
         RED "
@@ -2468,7 +2472,6 @@ Enter a number ${bwhite}(empty to skip)${blue}: "
         keypress
     fi
 
-    [[ "${web}" =~ ^(4|5|6|7|8|9)$ ]] && validpkgs+=("base-devel" "git")
     if [[ "${web}" =~ ^(1|2|3|4|5|6|7|8|9)$ ]]; then
         local prompt="${web_name}"
         web_slct="yes"
@@ -5857,8 +5860,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS
             mount /dev/mapper/root /mnt > "${void}" 2> "${log}" || err_abort
             sleep 0.2
             NC "
-==> [${green}Encrypted /Root OK${nc}]
-            "
+==> [${green}Encrypted /Root OK${nc}] "
             luks_root="ok"
 #------------------------------------------------------------------------------------------
         elif [[ "${fs}" == "2" ]]; then
@@ -5885,8 +5887,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS
             fi
             sleep 0.2
             NC "
-==> [${green}Encrypted /@ OK${nc}]
-            "
+==> [${green}Encrypted /@ OK${nc}] "
             luks_root="ok"
         fi
     else
@@ -5907,8 +5908,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS
             mkswap /dev/mapper/swap > "${void}" 2> "${log}" || err_abort
             sleep 0.2
             NC "
-==> [${green}Encrypted /Swap OK${nc}]
-            "
+==> [${green}Encrypted /Swap OK${nc}] "
             luks_swap="ok"
         else
             line2
@@ -5960,6 +5960,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS
             mount --mkdir "${esp_dev}" "${esp_mount}" > "${void}" 2> "${log}" || err_abort
             sleep 0.2
             NC "
+
 ==> [${green}/ESP OK${nc}]
             "
         else
@@ -5970,6 +5971,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS
         if mount --mkdir "${esp_dev}" "${esp_mount}" > "${void}" 2> "${log}" ; then
             sleep 0.2
             NC "
+
 ==> [${green}Unformatted /ESP Mounted OK${nc}]
             "
         else
@@ -5983,6 +5985,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS
             mount --mkdir "${esp_dev}" "${esp_mount}" > "${void}" 2> "${log}" || err_abort
             sleep 0.2
             NC "
+
 ==> [${green}/ESP OK${nc}]
             "
         else
@@ -6209,8 +6212,12 @@ pkg_validation() {
                             ------------------------------------------
                             ###  ${bwhite}Validating Installation Packages  ${yellowl}###
                             ------------------------------------------
+
+
         "
         validpkgs+=("${deskpkgs}")
+        echo "${validpkgs[*]}"
+        keypress
         valids="${validpkgs[*]}"
         line2
     if pacman -Syy > "${void}" 2>&1 2> "${log}" && pacman -Spd ${valids} > "${void}" 2>&1 2> "${log}"; then