Fix: A bug preventing Automatic partitioning to engage, has been addressed

Change: A lot of prompts have been edited for better aesthetics.
This commit is contained in:
Jane Doe
2025-11-19 00:34:51 +02:00
parent c2c81412b4
commit 2c31eeb280
+29 -23
View File
@@ -2,7 +2,7 @@
# Amelia Installer # Amelia Installer
# Source: https://gitlab.com/prism7/archery # Source: https://gitlab.com/prism7/archery
# Version: 1.0.7 # Version: 1.0.8
set -euo pipefail set -euo pipefail
################################################################################################### ###################################################################################################
@@ -212,17 +212,16 @@ ok() {
} }
stage_ok() { stage_ok() {
sleep 0.2 sleep 0.2
NC " GREEN "
==> [${green}${stage_prompt} OK${nc}] >> ${nc}${stage_prompt} ${green}OK "
"
sleep 0.3 sleep 0.3
} }
stage_fail() { stage_fail() {
sleep 0.2 sleep 0.2
NC " RED "
>> ${bwhite}${stage_prompt} ${nc}${red}FAILED${cyan}
==> [${red}[!] ${yellow}${stage_prompt} ${red}FAILED!${nc}] >> ${nc}Check ${yellowl}Amelia.log ${nc}for errors "
"
failure failure
} }
completion_err() { completion_err() {
@@ -3792,6 +3791,7 @@ partitioner() {
local prompt="Disk ${sgdrive} Preset-Partitioned" local prompt="Disk ${sgdrive} Preset-Partitioned"
fi fi
local stage_prompt="Partitioning Drive"
wipefs -af "${sgdrive}" > "${void}" 2> "${log}" || stage_fail wipefs -af "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
if [[ "${gptok}" != "yes" ]]; then if [[ "${gptok}" != "yes" ]]; then
sgdisk -Z "${sgdrive}" > "${void}" 2> "${log}" || stage_fail sgdisk -Z "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
@@ -4556,6 +4556,10 @@ ${multi_swap}
reload reload
until manual_part; do : ; done until manual_part; do : ; done
return 0 return 0
elif [[ "${multibooting}" == "n" ]]; then
reload
until auto_part; do : ; done
return 0
elif [[ "${multibooting}" == "y" ]]; then elif [[ "${multibooting}" == "y" ]]; then
reload reload
until manual_part; do : ; done until manual_part; do : ; done
@@ -4655,12 +4659,12 @@ ${magenta}###${nc}------------------------------------${magenta}[ ${bwhite}Encry
" "
BLUE " BLUE "
> Utilize LUKS encryption ? " > Utilize LUKS encryption for your system ? "
NC " NC "
* Type '${cyan}no${nc}' to proceed without encryption * Type '${cyan}no${nc}' to proceed without encryption
* Type '${cyan}yes${nc}' to encrypt your ${LuksParts} * Type '${cyan}yes${nc}' to encrypt your ${yellowl}${LuksParts}
" "
read -r -p " read -r -p "
==> " encrypt ==> " encrypt
@@ -4885,13 +4889,14 @@ instl() {
################################################################################################### ###################################################################################################
swappart() { swappart() {
local prompt="Swap Partition Creation"
local stage_prompt="Swap Partition Creation" local stage_prompt="Swap Partition Creation"
sleep 0.2 sleep 0.2
NC " NC "
${magenta}###${nc}----------------------------------${magenta}[ ${bwhite}Swap Partition Setup${nc} ${magenta}]${nc}----------------------------------${magenta}### ${magenta}###${nc}----------------------------------${magenta}[ ${bwhite}Swap Partition Setup${nc} ${magenta}]${nc}----------------------------------${magenta}###
" "
if mkswap "${swap_dev}" > "${void}" 2> "${log}" ; then if mkswap "${swap_dev}" > "${void}" 2> "${log}" ; then
stage_ok ok
else else
stage_fail stage_fail
fi fi
@@ -4920,11 +4925,10 @@ set_mode() {
return 0 return 0
fi fi
if [[ "${swapmode}" != "1" ]]; then
line2
fi
sleep 0.2 sleep 0.2
NC " NC "
${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Mode Selection${nc} ${magenta}]${nc}-------------------------------------${magenta}### ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Mode Selection${nc} ${magenta}]${nc}-------------------------------------${magenta}###
" "
YELLOW " YELLOW "
@@ -5849,12 +5853,11 @@ revise() {
################################################################################################### ###################################################################################################
sec_erase() { sec_erase() {
if [[ "${swapmode}" != "1" ]]; then
line2
fi
local prompt="Secure Erasure" local prompt="Secure Erasure"
sleep 0.2 sleep 0.2
NC " NC "
${magenta}###${nc}-----------------------------------${magenta}[ ${bwhite}Secure Disk Erasure${nc} ${magenta}]${nc}-----------------------------------${magenta}### ${magenta}###${nc}-----------------------------------${magenta}[ ${bwhite}Secure Disk Erasure${nc} ${magenta}]${nc}-----------------------------------${magenta}###
" "
erase_dsk_nmbr=" " erase_dsk_nmbr=" "
@@ -6344,6 +6347,7 @@ FSTAB_SBVL_MNT_OPTS
################################################################################################### ###################################################################################################
swapfile() { swapfile() {
local prompt="Swapfile Creation"
local stage_prompt="Swapfile Creation" local stage_prompt="Swapfile Creation"
sleep 0.2 sleep 0.2
NC " NC "
@@ -6357,7 +6361,7 @@ SWAPFILE
cat >> /mnt/etc/fstab <<-FSTAB || err_abort cat >> /mnt/etc/fstab <<-FSTAB || err_abort
/swapfile none swap defaults 0 0 /swapfile none swap defaults 0 0
FSTAB FSTAB
stage_ok ok
else else
stage_fail stage_fail
fi fi
@@ -6365,6 +6369,7 @@ FSTAB
################################################################################################### ###################################################################################################
swapfile_btrfs() { swapfile_btrfs() {
local prompt="Btrfs Swapfile Creation"
local stage_prompt="Btrfs Swapfile Creation" local stage_prompt="Btrfs Swapfile Creation"
sleep 0.2 sleep 0.2
NC " NC "
@@ -6378,7 +6383,7 @@ SWAPFILE_BTRFS
cat >> /mnt/etc/fstab <<-FSTAB || err_abort cat >> /mnt/etc/fstab <<-FSTAB || err_abort
/swap/swapfile none swap defaults 0 0 /swap/swapfile none swap defaults 0 0
FSTAB FSTAB
stage_ok ok
else else
stage_fail stage_fail
fi fi
@@ -6386,16 +6391,17 @@ FSTAB
################################################################################################### ###################################################################################################
set_wireless_regdom() { set_wireless_regdom() {
local prompt="Wireless Regulatory Domain"
local stage_prompt="Wireless Regulatory Domain" local stage_prompt="Wireless Regulatory Domain"
if [[ "${swapmode}" != "2" ]]; then
line2
fi
sleep 0.2 sleep 0.2
NC " NC "
${magenta}###${nc}--------------------------${magenta}[ ${bwhite}Setting Up Wireless Regulatory Domain${nc} ${magenta}]${nc}--------------------------${magenta}### ${magenta}###${nc}--------------------------${magenta}[ ${bwhite}Setting Up Wireless Regulatory Domain${nc} ${magenta}]${nc}--------------------------${magenta}###
" "
if sed -i "/^#WIRELESS_REGDOM=\"${REGDOM}\"/s/^#//" /mnt/etc/conf.d/wireless-regdom ; then if sed -i "/^#WIRELESS_REGDOM=\"${REGDOM}\"/s/^#//" /mnt/etc/conf.d/wireless-regdom ; then
stage_ok ok
line2
else else
stage_fail stage_fail
fi fi
@@ -7457,7 +7463,7 @@ CUSTOM_SRVC
run_as="$(whoami)" run_as="$(whoami)"
tty="$(tty)" tty="$(tty)"
void="/dev/null" void="/dev/null"
log="Amelia_log.txt" log="Amelia.log"
disks="$(lsblk --nodeps --paths --noheadings --output=name,size,model | cat --number)" disks="$(lsblk --nodeps --paths --noheadings --output=name,size,model | cat --number)"
trg="" trg=""
vars=(LOCALESET="" SETLOCALE="" lcl_slct="" USERNAME="" kernelnmbr="" fs="" gfxcount="" gfxcard="" intelcount="" intelcards="" nvidiacount="" nvidiacards="" amdcount="" amdcards="" vendor="" vendors="" desktop="" terminal="" efi_entr_del="" sanity="" install="" bootldr_pkgs="" devel="" REGDOM="" gfx_bootopts="" btrfs_bootopts="" trim="" swapmode="" homecrypt="" greeter="" greeternmbr="" cust_bootopts="" vmpkgs="" vm_services="" perf_stream="" displaymanager="" wireless_reg="" bitness="" bootloader="" gfx_slct="" espsize="" autoroot="" autoesp="" autoxboot="" autohome="" autoswap="" rootprt="" espprt="" xbootprt="" homeprt="" swapprt="" partok="" instl_drive="" sgdsk_nmbr="" part_mode="" preset="" capacity="" cap_gib="" rootsize="" sgdrive="" cgdrive="" smartpart="" presetpart="" prcnt="" roottype="" stage_prompt="" zram="" xbootloader="" multibooting="" hypervisor="" mkinitcpio_mods="" mkinitcpio_bins="" uki="" ukify="" cng_espmnt="" sep_home="" encr_swap_bootopts="" uefimode="" luks_encrypt="" nrg_plc="" multilib="" nvname="" nogsp="" luks_root="" luks_swap="" luks_home="" installation="" kill_watchdog="" oomd="" setrescue="" lowlat="" dev="" web="" web_pkg="" web_aur="" web_slct="" printer="" print_pkgs="" shellnmbr="" shell="" shellname="" shellname2="" shell_pkgs="" genoptm="" set_optm="" ask_param="" desk_setup="" set_optm_slct="" irqbalance="" thermald="" rngd="" rtkit="" tlp="" CRYPTPASS="" CRYPTPASS2="" askoptm="" gptslct="" gptok="" gptabort="" nvdprop="" nowarning="" efiname="" path="" hometype="" homeform="") vars=(LOCALESET="" SETLOCALE="" lcl_slct="" USERNAME="" kernelnmbr="" fs="" gfxcount="" gfxcard="" intelcount="" intelcards="" nvidiacount="" nvidiacards="" amdcount="" amdcards="" vendor="" vendors="" desktop="" terminal="" efi_entr_del="" sanity="" install="" bootldr_pkgs="" devel="" REGDOM="" gfx_bootopts="" btrfs_bootopts="" trim="" swapmode="" homecrypt="" greeter="" greeternmbr="" cust_bootopts="" vmpkgs="" vm_services="" perf_stream="" displaymanager="" wireless_reg="" bitness="" bootloader="" gfx_slct="" espsize="" autoroot="" autoesp="" autoxboot="" autohome="" autoswap="" rootprt="" espprt="" xbootprt="" homeprt="" swapprt="" partok="" instl_drive="" sgdsk_nmbr="" part_mode="" preset="" capacity="" cap_gib="" rootsize="" sgdrive="" cgdrive="" smartpart="" presetpart="" prcnt="" roottype="" stage_prompt="" zram="" xbootloader="" multibooting="" hypervisor="" mkinitcpio_mods="" mkinitcpio_bins="" uki="" ukify="" cng_espmnt="" sep_home="" encr_swap_bootopts="" uefimode="" luks_encrypt="" nrg_plc="" multilib="" nvname="" nogsp="" luks_root="" luks_swap="" luks_home="" installation="" kill_watchdog="" oomd="" setrescue="" lowlat="" dev="" web="" web_pkg="" web_aur="" web_slct="" printer="" print_pkgs="" shellnmbr="" shell="" shellname="" shellname2="" shell_pkgs="" genoptm="" set_optm="" ask_param="" desk_setup="" set_optm_slct="" irqbalance="" thermald="" rngd="" rtkit="" tlp="" CRYPTPASS="" CRYPTPASS2="" askoptm="" gptslct="" gptok="" gptabort="" nvdprop="" nowarning="" efiname="" path="" hometype="" homeform="")