mirror of
https://gitlab.com/prism7/archery.git
synced 2026-04-28 01:17:35 +02:00
Change: A few prompts have been edited for better aesthetics
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
# Amelia Installer
|
# Amelia Installer
|
||||||
# Source: https://gitlab.com/prism7/archery
|
# Source: https://gitlab.com/prism7/archery
|
||||||
# Version: 1.1.7
|
# Version: 1.1.8
|
||||||
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
###################################################################################################
|
###################################################################################################
|
||||||
@@ -4682,9 +4682,9 @@ ${multi_swap}
|
|||||||
ask_crypt() {
|
ask_crypt() {
|
||||||
|
|
||||||
local prompt="Encryption Setup"
|
local prompt="Encryption Setup"
|
||||||
LuksArray=("Root")
|
LuksArray=(Root)
|
||||||
[[ "${hometype}" == "1" ]] && LuksArray+=("Home")
|
[[ "${hometype}" == "1" ]] && LuksArray+=(Home)
|
||||||
[[ "${swapmode}" == "1" ]] && LuksArray+=("Swap")
|
[[ "${swapmode}" == "1" ]] && LuksArray+=(Swap)
|
||||||
delimiter=""
|
delimiter=""
|
||||||
LuksParts=""
|
LuksParts=""
|
||||||
for item in "${LuksArray[@]}"; do
|
for item in "${LuksArray[@]}"; do
|
||||||
@@ -5042,8 +5042,7 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A
|
|||||||
mount "${root_dev}" /mnt > "${void}" 2> "${log}" || err_abort
|
mount "${root_dev}" /mnt > "${void}" 2> "${log}" || err_abort
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
NC "
|
NC "
|
||||||
==> [${green}/Root OK${nc}]
|
==> [${green}/Root OK${nc}] "
|
||||||
"
|
|
||||||
else
|
else
|
||||||
umount_manual
|
umount_manual
|
||||||
until form_root; do : ; done
|
until form_root; do : ; done
|
||||||
@@ -5074,8 +5073,7 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A
|
|||||||
fi
|
fi
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
NC "
|
NC "
|
||||||
==> [${green}/@ OK${nc}]
|
==> [${green}/@ OK${nc}] "
|
||||||
"
|
|
||||||
else
|
else
|
||||||
umount_manual
|
umount_manual
|
||||||
until form_root; do : ; done
|
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
|
mount --mkdir "${esp_dev}" "${esp_mount}" > "${void}" 2> "${log}" || err_abort
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
NC "
|
NC "
|
||||||
==> [${green}/ESP OK${nc}]
|
==> [${green}/ESP OK${nc}] "
|
||||||
"
|
|
||||||
else
|
else
|
||||||
umount_manual
|
umount_manual
|
||||||
until form_esp; do : ; done
|
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
|
if mount --mkdir "${esp_dev}" "${esp_mount}" > "${void}" 2> "${log}" ; then
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
NC "
|
NC "
|
||||||
==> [${green}Unformatted /ESP Mounted OK${nc}]
|
==> [${green}Unformatted /ESP Mounted OK${nc}] "
|
||||||
"
|
|
||||||
else
|
else
|
||||||
umount_manual
|
umount_manual
|
||||||
until mount_mnt; do : ; done
|
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
|
mount --mkdir "${esp_dev}" "${esp_mount}" > "${void}" 2> "${log}" || err_abort
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
NC "
|
NC "
|
||||||
==> [${green}/ESP OK${nc}]
|
==> [${green}/ESP OK${nc}] "
|
||||||
"
|
|
||||||
else
|
else
|
||||||
umount_manual
|
umount_manual
|
||||||
until form_esp; do : ; done
|
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
|
mount --mkdir "${xboot_dev}" /mnt/boot > "${void}" 2> "${log}" || err_abort
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
NC "
|
NC "
|
||||||
==> [${green}/XBOOTLDR OK${nc}]
|
==> [${green}/XBOOTLDR OK${nc}] "
|
||||||
"
|
|
||||||
else
|
else
|
||||||
umount_manual
|
umount_manual
|
||||||
until form_xboot; do : ; done
|
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
|
mount --mkdir "${home_dev}" /mnt/home > "${void}" 2> "${log}" || err_abort
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
NC "
|
NC "
|
||||||
==> [${green}/Home OK${nc}]
|
==> [${green}/Home OK${nc}] "
|
||||||
"
|
|
||||||
else
|
else
|
||||||
umount_manual
|
umount_manual
|
||||||
until manual_part; do : ; done
|
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
|
mount --mkdir "${home_dev}" /mnt/home > "${void}" 2> "${log}" || err_abort
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
NC "
|
NC "
|
||||||
==> [${green}Unformatted /Home Mounted OK${nc}]
|
==> [${green}Unformatted /Home Mounted OK${nc}] "
|
||||||
"
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
keypress
|
keypress
|
||||||
|
|||||||
Reference in New Issue
Block a user