From 99d027ca21c67dee49e9bcffb636b3e0b99ed4e8 Mon Sep 17 00:00:00 2001
From: Jane Doe <ifeelsosecurenow@gmail.com>
Date: Sat, 15 Nov 2025 12:57:08 +0200
Subject: [PATCH] Change: 'Mode Selection' > 'Manual Mode': Formatting the
 {ESP,Extended Bootloader,Root} partitions cannot be skipped anymore.
 Formatting /Home partition can be skipped, as it can be re-used in the new
 system, if desired.

---
 Amelia.sh | 73 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/Amelia.sh b/Amelia.sh
index fc87572..ced2b02 100644
--- a/Amelia.sh
+++ b/Amelia.sh
@@ -2,7 +2,7 @@
 
 # Amelia Installer
 # Source: https://gitlab.com/prism7/archery
-# Version: 1.0.3
+# Version: 1.0.4
 
         set -euo pipefail
 ###################################################################################################
@@ -4741,9 +4741,9 @@ Enter a name: "
         if [[ -z "${ENCROOT}" ]]; then
             sleep 0.2
             RED "
-        -----------------------------------------
-        ###  ${nc}Please enter a name to continue  ${red}###
-        -----------------------------------------"
+        -----------------------------
+        ###  ${nc}Please enter a name  ${red}###
+        -----------------------------"
             reload
             return 1
         elif [[ -n "${ENCROOT}" ]]; then
@@ -4793,9 +4793,9 @@ Enter a name: "
                     if [[ -z "${ENCRHOME}" ]]; then
                         sleep 0.2
                         RED "
-        -----------------------------------------
-        ###  ${nc}Please enter a name to continue  ${red}###
-        -----------------------------------------"
+        -----------------------------
+        ###  ${nc}Please enter a name  ${red}###
+        -----------------------------"
                         reload
                         return 1
                     elif [[ -n "${ENCRHOME}" ]]; then
@@ -5248,13 +5248,13 @@ ${volumes}"
         BLUE "
 
 
-Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: "
+Enter a partition number: "
         read -r -p "
 ==> " form_esp_nmbr
 
         if [[ -n "${form_esp_nmbr}" ]]; then
             esppart="$(echo "${volumes}" | awk "\$1 == ${form_esp_nmbr} {print \$2}")"
-            manespfs="$(lsblk -dno FSTYPE "${esppart}")"
+            manespfs="$(lsblk -dno FSTYPE "${esppart}" 2> "${void}")"
             if [[ -e "${esppart}" ]]; then
                 if [[ "${multibooting}" == "n" ]]; then
                     if mkfs.fat -F 32 -n ESP "${esppart}" > "${void}" 2> "${log}" ; then
@@ -5293,13 +5293,10 @@ Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: "
                 invalid
                 return 1
             fi
+        else
+            choice
+            return 1
         fi
-        RED "
-        ---------------------------------------------------
-        ###  ${yellow}WARNING: ${nc}PARTITION HAS NOT BEEN FORMATTED  ${red}###
-        ---------------------------------------------------"
-        sleep 2
-        skip
     done
 }
 ###################################################################################################
@@ -5323,7 +5320,7 @@ ${volumes}"
         BLUE "
 
 
-Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: "
+Enter a partition number: "
         read -r -p "
 ==> " form_xboot_nmbr
 
@@ -5346,13 +5343,10 @@ Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: "
                 invalid
                 return 1
             fi
+        else
+            choice
+            return 1
         fi
-        RED "
-        ---------------------------------------------------
-        ###  ${yellow}WARNING: ${nc}PARTITION HAS NOT BEEN FORMATTED  ${red}###
-        ---------------------------------------------------"
-        sleep 2
-        skip
     done
 }
 ###################################################################################################
@@ -5376,7 +5370,7 @@ ${volumes}"
         BLUE "
 
 
-Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: "
+Enter a partition number: "
         read -r -p "
 ==> " form_root_nmbr
 
@@ -5435,7 +5429,7 @@ Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: "
             BLUE "
 
 
-Enter a name ${bwhite}(empty to skip and proceed)${blue}: "
+Enter a name: "
             read -r -p "
 ==> " rootpartname
 
@@ -5461,17 +5455,18 @@ Enter a name ${bwhite}(empty to skip and proceed)${blue}: "
 ==> [${green}Label ${roottype} OK${nc}] "
                     return 0
                 fi
+            else
+                sleep 0.2
+                RED "
+        -----------------------------
+        ###  ${nc}Please enter a name  ${red}###
+        -----------------------------"
+                reload
+                return 1
             fi
-            skip
-            return 0
         else
-            RED "
-        ---------------------------------------------------
-        ###  ${yellow}WARNING: ${nc}PARTITION HAS NOT BEEN FORMATTED  ${red}###
-        ---------------------------------------------------"
-            sleep 2
-            skip
-            return 0
+            choice
+            return 1
         fi
     done
 }
@@ -5577,7 +5572,7 @@ Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: "
             BLUE "
 
 
-Enter a name ${bwhite}(empty to skip and proceed)${blue}: "
+Enter a name: "
             read -r -p "
 ==> " homepartname
 
@@ -5592,9 +5587,15 @@ Enter a name ${bwhite}(empty to skip and proceed)${blue}: "
                     err_try
                     return 1
                 fi
+            else
+                sleep 0.2
+                RED "
+        -----------------------------
+        ###  ${nc}Please enter a name  ${red}###
+        -----------------------------"
+                reload
+                return 1
             fi
-            skip
-            return 0
         else
             RED "
         ---------------------------------------------------