From 02f8c57372af3b0b9ec0c7cdef2cca3a6b437717 Mon Sep 17 00:00:00 2001
From: elementrick <ifeelsosecurenow@gmail.com>
Date: Sun, 30 Jun 2024 07:51:40 +0000
Subject: [PATCH] Code optimization

---
 Amelia.sh | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/Amelia.sh b/Amelia.sh
index 7332668..2c1dc13 100644
--- a/Amelia.sh
+++ b/Amelia.sh
@@ -2348,22 +2348,16 @@ Enter a disk number ${bwhite}(empty to skip)${blue}: "
 
                 if [[ "${fs}" == "2" && "${swapmode}" == "1" ]] ; then
                     preset="2"
-                elif [[ "${fs}" == "2" && "${swapmode}" == "2" ]] ; then
-                    preset="1"
-                elif [[ "${fs}" == "2" && "${swapmode}" == "3" ]] ; then
+                elif [[ "${fs}" == "2" && "${swapmode}" == "2" ]] || [[ "${fs}" == "2" && "${swapmode}" == "3" ]] ; then
                     preset="1"
                 elif [[ "${fs}" == "1" ]] ; then
                     if [[ "${sep_home}" == "y" && "${swapmode}" == "1" ]] ; then
                         preset="4"
-                    elif [[ "${sep_home}" == "y" && "${swapmode}" == "2" ]] ; then
-                        preset="3"
-                    elif [[ "${sep_home}" == "y" && "${swapmode}" == "3" ]] ; then
+                    elif [[ "${sep_home}" == "y" && "${swapmode}" == "2" ]] || [[ "${sep_home}" == "y" && "${swapmode}" == "3" ]]; then
                         preset="3"
                     elif [[ "${sep_home}" == "n" && "${swapmode}" == "1" ]] ; then
                         preset="2"
-                    elif [[ "${sep_home}" == "n" && "${swapmode}" == "2" ]] ; then
-                        preset="1"
-                    elif [[ "${sep_home}" == "n" && "${swapmode}" == "3" ]] ; then
+                    elif [[ "${sep_home}" == "n" && "${swapmode}" == "2" ]] || [[ "${sep_home}" == "n" && "${swapmode}" == "3" ]]; then
                         preset="1"
                     fi
                 else
@@ -3560,6 +3554,7 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A
 ###################################################################################################
 manual_mode (){
 
+        volumes="$(fdisk -l | grep '^/dev' | cat --number)"
     if [[ -e "${home_dev}" && "${sep_home}" == "y" ]]; then
         if [[ "${fs}" == "1" ]]; then
             until form_efi; do : ; done