diff --git a/Amelia.sh b/Amelia.sh index edc5a3f..4eb1164 100644 --- a/Amelia.sh +++ b/Amelia.sh @@ -2,7 +2,7 @@ # Amelia Installer # Source: https://gitlab.com/prism7/archery -# Version: 1.1.7 +# Version: 1.1.8 set -euo pipefail ################################################################################################### @@ -4682,9 +4682,9 @@ ${multi_swap} ask_crypt() { local prompt="Encryption Setup" - LuksArray=("Root") - [[ "${hometype}" == "1" ]] && LuksArray+=("Home") - [[ "${swapmode}" == "1" ]] && LuksArray+=("Swap") + LuksArray=(Root) + [[ "${hometype}" == "1" ]] && LuksArray+=(Home) + [[ "${swapmode}" == "1" ]] && LuksArray+=(Swap) delimiter="" LuksParts="" for item in "${LuksArray[@]}"; do @@ -5042,8 +5042,7 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A mount "${root_dev}" /mnt > "${void}" 2> "${log}" || err_abort sleep 0.2 NC " -==> [${green}/Root OK${nc}] - " +==> [${green}/Root OK${nc}] " else umount_manual until form_root; do : ; done @@ -5074,8 +5073,7 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A fi sleep 0.2 NC " -==> [${green}/@ OK${nc}] - " +==> [${green}/@ OK${nc}] " else umount_manual until form_root; do : ; done @@ -5089,8 +5087,7 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A mount --mkdir "${esp_dev}" "${esp_mount}" > "${void}" 2> "${log}" || err_abort sleep 0.2 NC " -==> [${green}/ESP OK${nc}] - " +==> [${green}/ESP OK${nc}] " else umount_manual until form_esp; do : ; done @@ -5101,8 +5098,7 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A if mount --mkdir "${esp_dev}" "${esp_mount}" > "${void}" 2> "${log}" ; then sleep 0.2 NC " -==> [${green}Unformatted /ESP Mounted OK${nc}] - " +==> [${green}Unformatted /ESP Mounted OK${nc}] " else umount_manual until mount_mnt; do : ; done @@ -5113,8 +5109,7 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A mount --mkdir "${esp_dev}" "${esp_mount}" > "${void}" 2> "${log}" || err_abort sleep 0.2 NC " -==> [${green}/ESP OK${nc}] - " +==> [${green}/ESP OK${nc}] " else umount_manual until form_esp; do : ; done @@ -5129,8 +5124,7 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A mount --mkdir "${xboot_dev}" /mnt/boot > "${void}" 2> "${log}" || err_abort sleep 0.2 NC " -==> [${green}/XBOOTLDR OK${nc}] - " +==> [${green}/XBOOTLDR OK${nc}] " else umount_manual until form_xboot; do : ; done @@ -5158,8 +5152,7 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A mount --mkdir "${home_dev}" /mnt/home > "${void}" 2> "${log}" || err_abort sleep 0.2 NC " -==> [${green}/Home OK${nc}] - " +==> [${green}/Home OK${nc}] " else umount_manual until manual_part; do : ; done @@ -5175,8 +5168,7 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A mount --mkdir "${home_dev}" /mnt/home > "${void}" 2> "${log}" || err_abort sleep 0.2 NC " -==> [${green}Unformatted /Home Mounted OK${nc}] - " +==> [${green}Unformatted /Home Mounted OK${nc}] " fi fi keypress