From d11914343400b7863c6e8147a4c5ff9590d9d8db Mon Sep 17 00:00:00 2001 From: elementrick Date: Wed, 24 Jul 2024 10:29:05 +0000 Subject: [PATCH] Change: Edit a few prompts for clarification/aesthetic purposes Change: Make 'lightdm-gtk-greeter' the default option when selecting the 'Mate' and "Budgie' desktops Variable renaming (better description) --- Amelia.sh | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/Amelia.sh b/Amelia.sh index 643ebd8..43a2461 100644 --- a/Amelia.sh +++ b/Amelia.sh @@ -1,7 +1,7 @@ #!/bin/bash # Amelia Installer -# Version: 6.7 +# Version: 6.8 set -euo pipefail trap 's=$?; echo "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR @@ -107,7 +107,8 @@ invalid (){ sleep 0.3 RED " - [!] Invalid response " + [!] Invalid response + " reload } err_try (){ @@ -200,9 +201,8 @@ stage_ok (){ } stage_fail (){ sleep 0.3 - RED " - - [!] ${stage_prompt} configuration FAILED " + line2 + REDBG " ${yellow}[!] ${stage_prompt} configuration FAILED [!]" failure } completion_err (){ @@ -249,15 +249,16 @@ arch (){ line3 BLUEBG "************************************************************************************************* " BLUEBG " " - BLUEBG " ##### Arch Linux Installation ##### " + BLUEBG " ##### Archlinux Installation ##### " BLUEBG " " BLUEBG "************************************************************************************************* " line2 } cnfg (){ + sleep 0.3 line3 YELLOWBG "------------------------------------------------------------------------------------------------- " - YELLOWBG " ### Configuring... ### " + YELLOWBG " ### Configuring... ### " YELLOWBG "------------------------------------------------------------------------------------------------- " echo sleep 0.3 @@ -267,7 +268,7 @@ completion (){ line3 GREENBG "************************************************************************************************* " GREENBG " " - GREENBG " ### Installation Completed ### " + GREENBG " ### Installation Completed ### " GREENBG " " GREENBG "************************************************************************************************* " line3 @@ -277,7 +278,7 @@ failure (){ line3 REDBG "************************************************************************************************* " REDBG " " - REDBG " ### Installation Failed ### " + REDBG " ### Installation Aborted ### " REDBG " " REDBG "************************************************************************************************* " line3 @@ -2416,7 +2417,7 @@ ${magenta}###${nc}---------------------------------${magenta}[ ${bwhite}Automati REDBG " [!] WARNING: All data on selected disk will be destroyed [!] " REDBG " ------------------------------------------------------------ " line2 - if [[ -e "${instl_drive}" && "${use_man}" != "yes" ]]; then + if [[ -e "${instl_drive}" && "${use_manpreset}" != "yes" ]]; then line2 YELLOWBG " ------------------------------------------------------- " YELLOWBG " > Apply 'Smart Partitioning' on disk '${instl_drive}'? [y/n] " @@ -2430,7 +2431,7 @@ ${magenta}###${nc}---------------------------------${magenta}[ ${bwhite}Automati sgdsk_nmbr="${instl_dsk_nmbr}" elif [[ "${smartpart}" == "n" ]]; then sgdsk_nmbr="${instl_dsk_nmbr}" - use_man="yes" + use_manpreset="yes" until man_preset; do : ; done else invalid @@ -2466,7 +2467,7 @@ Enter a disk number ${bwhite}(empty to skip)${blue}: " until dsks_submn; do : ; done fi - if [[ -z "${use_man}" ]] ; then + if [[ -z "${use_manpreset}" ]] ; then if [[ "${fs}" == "2" && "${swapmode}" == "1" ]]; then preset="2" elif [[ "${fs}" == "2" && "${swapmode}" == "2" ]] || [[ "${fs}" == "2" && "${swapmode}" == "3" ]]; then @@ -3132,7 +3133,7 @@ ${multi_swap} sleep 0.3 NC " -==> [${green}Disk ${sgdrive} Auto-Partitioned OK${nc}] " +==> [${green}Disk ${sgdrive} Smart-Partitioned OK${nc}] " sleep 0.3 YELLOW " @@ -4589,7 +4590,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs 5) # NOTE: Xfce Desktop: - deskpkgs="${basepkgs} xfce4 lightdm-slick-greeter network-manager-applet" + deskpkgs="${basepkgs} xfce4 lightdm-gtk-greeter network-manager-applet" displaymanager="lightdm" network="NetworkManager" ;; @@ -4620,7 +4621,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs 10) # NOTE: Mate Desktop: - deskpkgs="${basepkgs} mate mate-terminal mate-media blueman network-manager-applet mate-power-manager system-config-printer lightdm-slick-greeter" + deskpkgs="${basepkgs} mate mate-terminal mate-media blueman network-manager-applet mate-power-manager system-config-printer lightdm-gtk-greeter" displaymanager="lightdm" bluetooth="bluetooth" network="NetworkManager" ;; @@ -4950,7 +4951,7 @@ DEEPIN else stage_fail fi - elif [[ "${packages}" == "8" ]]; then + elif [[ "${packages}" == "5" || "${packages}" == "8" || "${packages}" == "10" ]]; then stage_prompt="GTK Greeter" if arch-chroot /mnt <<-GTK > /dev/null 2>&1 ; then sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-gtk-greeter|g' /etc/lightdm/lightdm.conf || exit @@ -4959,7 +4960,7 @@ GTK else stage_fail fi - else + elif [[ "${packages}" == "6" ]]; then stage_prompt="Slick Greeter" if arch-chroot /mnt <<-SLICK > /dev/null 2>&1 ; then sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-slick-greeter|g' /etc/lightdm/lightdm.conf || exit @@ -5574,7 +5575,7 @@ NVIDIA_HOOK swapprt="" smartpart="" partok="" - use_man="" + use_manpreset="" manpart="" instl_drive="" sgdsk_nmbr="" @@ -5589,6 +5590,7 @@ NVIDIA_HOOK autopart="" prcnt="" roottype="" + stage_prompt='' clear first_check