From afa20186a18c2b840fc77f488c1e316b2e32741d Mon Sep 17 00:00:00 2001 From: Jane Doe Date: Mon, 29 Sep 2025 22:23:32 +0300 Subject: [PATCH] Change: Selecting/Enabling printer & scanner support now defaults to 'No' Change: Edit a few prompts for better aesthetics --- Amelia.sh | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/Amelia.sh b/Amelia.sh index 1654a90..e0d4dd0 100644 --- a/Amelia.sh +++ b/Amelia.sh @@ -2,7 +2,7 @@ # Amelia Installer # Source: https://gitlab.com/prism7/archery -# Version: 9.8.2 +# Version: 9.8.3 set -euo pipefail ################################################################################################### @@ -2520,15 +2520,15 @@ ${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}Printer & - > Enable Printer & Scanner support ? [Y/n] " + > Enable Printer & Scanner support ? [y/N] " BLUE " -Enter [Y/n]: " +Enter [y/N]: " read -r -p " ==> " printer - printer="${printer:-y}" + printer="${printer:-n}" printer="${printer,,}" case "${printer}" in @@ -3595,11 +3595,13 @@ ${magenta}###${nc}---------------------------------${magenta}[ ${bwhite}Automati return 0 fi sleep 0.2 - NC " - ------------------------------------------------------------ - ${cyan}>>> ${nc}Apply ${yellowl}'Smart Partitioning' ${nc}on disk ${bwhite}'${instl_drive}'${nc} ? ${cyan}[Y/n]${nc} - ------------------------------------------------------------ - " + CYAN " + + >>> ${nc}Apply ${yellowl}'Smart Partitioning' ${nc}on disk ${bwhite}'${instl_drive}'${nc} ? ${cyan}[Y/n] " + BLUE " + + +Enter [Y/n]: " read -r -p " ==> " smartpart @@ -6552,10 +6554,11 @@ FSTAB set_wireless_regdom() { local stage_prompt="Wireless Regulatory Domain" + if [[ "${swapmode}" != "2" ]]; then + line2 + fi sleep 0.2 NC " - - ${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