diff --git a/Amelia.sh b/Amelia.sh index 7c8699b..f87b4d5 100644 --- a/Amelia.sh +++ b/Amelia.sh @@ -2,7 +2,7 @@ # Amelia Installer # https://gitlab.com/prism7/archery -# Version: 8.0.11 +# Version: 8.1.0 set -euo pipefail ################################################################################################### @@ -91,6 +91,14 @@ process() { --> [${green}Processing..${nc}] " } +pkg_displ() { + sleep 0.2 + NC " + +${green}Packages to be installed${nc}: + +${deskpkgs}" +} vm() { sleep 0.2 RED " @@ -210,7 +218,7 @@ stage_ok() { stage_fail() { sleep 0.2 line2 - REDBG " ${yellow}[!] ${stage_prompt} configuration FAILED [!]" + REDBG " ${yellow}[!] ${stage_prompt} FAILED [!]" failure } completion_err() { @@ -284,13 +292,7 @@ cnfg() { MAGENTABG "------------------------------------------------------------------------------------------------- " MAGENTABG " ### Configuring ### " MAGENTABG "------------------------------------------------------------------------------------------------- " - line2 - NC " - - ... Please Wait ... - - " - sleep 0.2 + line3 } completion() { sleep 0.2 @@ -2980,7 +2982,7 @@ ${magenta}###${nc}--------------------------------------${magenta}[ ${bwhite}San swap_comply="$(fdisk -l "${instl_drive}" | grep -E 'swap' | awk "{print \$1}" | cat --number | grep -E '1[[:blank:]]' | awk "{print \$2}")" if [[ "${rootcount}" -gt "1" ]]; then - local stage_prompt="Partition" + local stage_prompt="Selecting Partition" sleep 0.2 RED " ---------------------------------------------------------------------------- @@ -3032,7 +3034,7 @@ ${multi_root} fi if [[ "${espcount}" -gt "1" ]]; then - local stage_prompt="Partition" + local stage_prompt="Selecting Partition" sleep 0.2 RED " -------------------------------------------------------------------- @@ -3089,7 +3091,7 @@ ${multi_esp} fi if [[ "${xbootcount}" -gt "1" ]]; then - local stage_prompt="Partition" + local stage_prompt="Selecting Partition" sleep 0.2 RED " ----------------------------------------------------------------------------- @@ -3140,7 +3142,7 @@ ${multi_xboot} fi if [[ ${fs} == "1" && ${sep_home} == "y" && "${homecount}" -gt "1" ]]; then - local stage_prompt="Partition" + local stage_prompt="Selecting Partition" sleep 0.2 RED " --------------------------------------------------------------------- @@ -3191,7 +3193,7 @@ ${multi_home} fi if [[ ${swapmode} == "1" && "${swapcount}" -gt "1" ]]; then - local stage_prompt="Partition" + local stage_prompt="Selecting Partition" sleep 0.2 RED " --------------------------------------------------------------------- @@ -3886,7 +3888,7 @@ instl() { ################################################################################################### swappart() { - local stage_prompt="Swap Partition" + local stage_prompt="Swap Partition Creation" sleep 0.2 NC " @@ -5216,6 +5218,7 @@ Enter a number: " pacstrap_system() { local prompt="Pacstrap System" + basepkgs=(base efibootmgr nano pkgstats sudo vim "${fstools}" "${kernel}" "${microcode}") sleep 0.2 NC " @@ -5223,74 +5226,103 @@ pacstrap_system() { ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacstrap System${nc} ${magenta}]${nc}-------------------------------------${magenta}### " cnfg + if [[ "${bootloader}" == "2" ]]; then if [[ "${fs}" == "1" ]]; then - bootldr_pkgs="efibootmgr grub os-prober" + bootldr_pkgs="grub os-prober" elif [[ "${fs}" == "2" ]]; then - bootldr_pkgs="efibootmgr grub-btrfs os-prober" + bootldr_pkgs="grub-btrfs os-prober" fi fi - if [[ "${vendor}" == "Virtual Machine" ]]; then - basepkgs="base pkgstats nano sudo vim ${bootldr_pkgs} ${fstools} ${kernel} ${microcode} ${vmpkgs} ${devel} ${zram} ${ukify}" - elif [[ "${vendor}" == "Nvidia" ]]; then - basepkgs="base linux-firmware pkgstats nano sudo vim ${bootldr_pkgs} ${fstools} ${kernel} ${kernel}-headers ${microcode} ${vgapkgs} ${wireless_reg} ${devel} ${zram} ${ukify}" - else - basepkgs="base linux-firmware pkgstats nano sudo vim ${bootldr_pkgs} ${fstools} ${kernel} ${microcode} ${vgapkgs} ${wireless_reg} ${devel} ${zram} ${ukify}" + + if [[ -n "${bootldr_pkgs}" ]]; then + basepkgs+=("${bootldr_pkgs}") fi + + if [[ "${vendor}" == "Virtual Machine" ]]; then + basepkgs+=("${vmpkgs}") + else + basepkgs+=("linux-firmware") + fi + + if [[ "${vendor}" == "Nvidia" ]]; then + basepkgs+=("${kernel}-headers") + fi + + if [[ -n "${vgapkgs}" ]]; then + basepkgs+=("${vgapkgs}") + fi + + if [[ -n "${wireless_reg}" ]]; then + basepkgs+=("${wireless_reg}") + fi + + if [[ -n "${devel}" ]]; then + basepkgs+=("${devel}") + fi + + if [[ -n "${zram}" ]]; then + basepkgs+=("${zram}") + fi + + if [[ -n "${ukify}" ]]; then + basepkgs+=("${ukify}") + fi + case "${packages}" in 1) # Plasma Desktop: - deskpkgs="${basepkgs} plasma konsole" + deskpkgs="${basepkgs[*]} plasma konsole" displaymanager="sddm" bluetooth="bluetooth" network="NetworkManager" ;; 2) # Minimal Plasma & Apps: - deskpkgs="${basepkgs} alsa-firmware alsa-utils arj ark bluedevil breeze-gtk ccache cups-pdf cups-pk-helper dolphin-plugins efibootmgr exfatprogs fdkaac ffmpegthumbs git glibc-locales gst-libav gst-plugin-libcamera gst-plugin-msdk gst-plugin-opencv gst-plugin-pipewire gst-plugin-qmlgl gst-plugin-va gst-plugin-wpe gst-plugins-ugly gstreamer-vaapi htop icoutils ipp-usb kamera kamoso kate kcalc kde-gtk-config kdegraphics-mobipocket kdegraphics-thumbnailers kdenetwork-filesharing kdeplasma-addons kdesdk-kio kdesdk-thumbnailers kdialog keditbookmarks kget kimageformats kinit kio-admin kio-gdrive kio-zeroconf kompare konsole kscreen kvantum kwrited libappimage libfido2 libktorrent libmms libnfs libva-utils lirc lrzip lua52-socket lzop mac man-db man-pages mesa-demos mesa-utils mold nano-syntax-highlighting nss-mdns ntfs-3g okular opus-tools p7zip packagekit-qt6 pacman-contrib partitionmanager pbzip2 pigz pipewire-alsa pipewire-jack pipewire-pulse plasma-browser-integration plasma-desktop plasma-disks plasma-firewall plasma-nm plasma-pa plasma-wayland-protocols power-profiles-daemon powerdevil powerline powerline-fonts print-manager python-pyqt6 python-reportlab qbittorrent qt6-imageformats qt6-scxml qt6-virtualkeyboard realtime-privileges reflector rng-tools sddm-kcm skanlite sof-firmware sox spectacle sshfs system-config-printer terminus-font timidity++ ttf-ubuntu-font-family unarchiver unrar unzip usb_modeswitch usbutils vdpauinfo vlc vorbis-tools wget xdg-desktop-portal xdg-desktop-portal-gtk xdg-desktop-portal-kde zip zsh zsh-autosuggestions zsh-completions zsh-syntax-highlighting ${nrg_plc}" ;; + deskpkgs="${basepkgs[*]} alsa-firmware alsa-utils arj ark bluedevil breeze-gtk ccache cups-pdf cups-pk-helper dolphin-plugins exfatprogs fdkaac ffmpegthumbs git glibc-locales gst-libav gst-plugin-libcamera gst-plugin-msdk gst-plugin-opencv gst-plugin-pipewire gst-plugin-qmlgl gst-plugin-va gst-plugin-wpe gst-plugins-ugly gstreamer-vaapi htop icoutils ipp-usb kamera kamoso kate kcalc kde-gtk-config kdegraphics-mobipocket kdegraphics-thumbnailers kdenetwork-filesharing kdeplasma-addons kdesdk-kio kdesdk-thumbnailers kdialog keditbookmarks kget kimageformats kinit kio-admin kio-gdrive kio-zeroconf kompare konsole kscreen kvantum kwrited libappimage libfido2 libktorrent libmms libnfs libva-utils lirc lrzip lua52-socket lzop mac man-db man-pages mesa-demos mesa-utils mold nano-syntax-highlighting nss-mdns ntfs-3g okular opus-tools p7zip packagekit-qt6 pacman-contrib partitionmanager pbzip2 pigz pipewire-alsa pipewire-jack pipewire-pulse plasma-browser-integration plasma-desktop plasma-disks plasma-firewall plasma-nm plasma-pa plasma-wayland-protocols power-profiles-daemon powerdevil powerline powerline-fonts print-manager python-pyqt6 python-reportlab qbittorrent qt6-imageformats qt6-scxml qt6-virtualkeyboard realtime-privileges reflector rng-tools sddm-kcm skanlite sof-firmware sox spectacle sshfs system-config-printer terminus-font timidity++ ttf-ubuntu-font-family unarchiver unrar unzip usb_modeswitch usbutils vdpauinfo vlc vorbis-tools wget xdg-desktop-portal xdg-desktop-portal-gtk xdg-desktop-portal-kde zip zsh zsh-autosuggestions zsh-completions zsh-syntax-highlighting ${nrg_plc}" ;; 3) # Gnome Desktop: - deskpkgs="${basepkgs} gnome networkmanager" + deskpkgs="${basepkgs[*]} gnome networkmanager" displaymanager="gdm" bluetooth="bluetooth" network="NetworkManager" ;; 4) # Minimal Gnome & Apps: - deskpkgs="${basepkgs} dconf-editor evince file-roller gdm gnome-calculator gnome-clocks gnome-console gnome-control-center gnome-disk-utility gnome-keyring gnome-menus gnome-session gnome-shell-extensions gnome-system-monitor gnome-text-editor gnome-tweaks gvfs gvfs-afc gvfs-mtp loupe malcontent nautilus networkmanager power-profiles-daemon simple-scan sushi system-config-printer xdg-desktop-portal-gnome xdg-user-dirs-gtk alsa-firmware alsa-utils ccache cups-pdf efibootmgr exfatprogs fdkaac git glib2-devel glibc-locales gnome-browser-connector gparted gst-libav gst-plugin-libcamera gst-plugin-msdk gst-plugin-opencv gst-plugin-pipewire gst-plugin-qmlgl gst-plugin-va gst-plugin-wpe gst-plugins-ugly gstreamer-vaapi htop icoutils ipp-usb libfido2 libva-utils lrzip mac man-db man-pages meld mesa-utils nano-syntax-highlighting nss-mdns ntfs-3g p7zip pacman-contrib pbzip2 pigz pipewire-alsa pipewire-jack pipewire-pulse powerline powerline-fonts qbittorrent realtime-privileges reflector rng-tools sof-firmware sox terminus-font ttf-ubuntu-font-family unrar unzip usb_modeswitch usbutils vdpauinfo vlc wget zip zsh zsh-autosuggestions zsh-completions zsh-syntax-highlighting ${nrg_plc}" ;; + deskpkgs="${basepkgs[*]} dconf-editor evince file-roller gdm gnome-calculator gnome-clocks gnome-console gnome-control-center gnome-disk-utility gnome-keyring gnome-menus gnome-session gnome-shell-extensions gnome-system-monitor gnome-text-editor gnome-tweaks gvfs gvfs-afc gvfs-mtp loupe malcontent nautilus networkmanager power-profiles-daemon simple-scan sushi system-config-printer xdg-desktop-portal-gnome xdg-user-dirs-gtk alsa-firmware alsa-utils ccache cups-pdf exfatprogs fdkaac git glib2-devel glibc-locales gnome-browser-connector gparted gst-libav gst-plugin-libcamera gst-plugin-msdk gst-plugin-opencv gst-plugin-pipewire gst-plugin-qmlgl gst-plugin-va gst-plugin-wpe gst-plugins-ugly gstreamer-vaapi htop icoutils ipp-usb libfido2 libva-utils lrzip mac man-db man-pages meld mesa-utils nano-syntax-highlighting nss-mdns ntfs-3g p7zip pacman-contrib pbzip2 pigz pipewire-alsa pipewire-jack pipewire-pulse powerline powerline-fonts qbittorrent realtime-privileges reflector rng-tools sof-firmware sox terminus-font ttf-ubuntu-font-family unrar unzip usb_modeswitch usbutils vdpauinfo vlc wget zip zsh zsh-autosuggestions zsh-completions zsh-syntax-highlighting ${nrg_plc}" ;; 5) # Xfce Desktop: - deskpkgs="${basepkgs} xfce4 lightdm-gtk-greeter network-manager-applet" + deskpkgs="${basepkgs[*]} xfce4 lightdm-gtk-greeter network-manager-applet" displaymanager="lightdm" network="NetworkManager" ;; 6) # Cinnamon Desktop: - deskpkgs="${basepkgs} cinnamon blueberry lightdm-slick-greeter system-config-printer gnome-keyring ${terminal}" + deskpkgs="${basepkgs[*]} cinnamon blueberry lightdm-slick-greeter system-config-printer gnome-keyring ${terminal}" displaymanager="lightdm" bluetooth="bluetooth" network="NetworkManager" ;; 7) # Deepin Desktop: - deskpkgs="${basepkgs} deepin deepin-terminal deepin-kwin networkmanager" + deskpkgs="${basepkgs[*]} deepin deepin-terminal deepin-kwin networkmanager" displaymanager="lightdm" network="NetworkManager" ;; 8) # Budgie Desktop: - deskpkgs="${basepkgs} budgie lightdm-gtk-greeter arc-gtk-theme papirus-icon-theme network-manager-applet ${terminal}" + deskpkgs="${basepkgs[*]} budgie lightdm-gtk-greeter arc-gtk-theme papirus-icon-theme network-manager-applet ${terminal}" displaymanager="lightdm" network="NetworkManager" ;; 9) # Lxqt Desktop: - deskpkgs="${basepkgs} lxqt lxqt-wayland-session breeze-icons network-manager-applet sddm xscreensaver" + deskpkgs="${basepkgs[*]} lxqt lxqt-wayland-session breeze-icons network-manager-applet sddm xscreensaver" displaymanager="sddm" network="NetworkManager" ;; 10) # Mate Desktop: - deskpkgs="${basepkgs} mate mate-terminal mate-media blueman network-manager-applet mate-power-manager system-config-printer lightdm-gtk-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" ;; 11) # Base System: - deskpkgs="${basepkgs} networkmanager" + deskpkgs="${basepkgs[*]} networkmanager" network="NetworkManager" ;; 12) # Custom System: @@ -5300,7 +5332,18 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs deskpkgs="base linux-firmware sudo ${bootldr_pkgs} ${custompkgs} ${fstools} ${kernel} ${microcode} ${vgapkgs} ${wireless_reg} ${greeter}" fi ;; esac - + + pkg_displ + NC " + + + + ${bwhite}Press any key to continue${nc} + + + " + read -r -s -n 1 + if pacstrap -K /mnt ${deskpkgs} ; then if [[ "${fs}" == "2" ]]; then genfstab -t PARTUUID /mnt >> /mnt/etc/fstab || err_abort @@ -5313,11 +5356,15 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs else failure fi + + if [[ "${swapmode}" != "2" ]]; then + line2 + fi } ################################################################################################### swapfile() { - local stage_prompt="Swapfile" + local stage_prompt="Swapfile Creation" sleep 0.2 NC " @@ -5338,7 +5385,7 @@ FSTAB ################################################################################################### swapfile_btrfs() { - local stage_prompt="Btrfs Swapfile" + local stage_prompt="Btrfs Swapfile Creation" sleep 0.2 NC " @@ -5359,7 +5406,7 @@ FSTAB ################################################################################################### wireless_regdom() { - local stage_prompt="Wireless Regdom" + local stage_prompt="Wireless Regulatory Domain" sleep 0.2 NC " @@ -5375,7 +5422,7 @@ ${magenta}###${nc}--------------------------${magenta}[ ${bwhite}Setting Up Wire ################################################################################################### main_chroot() { - stage_prompt="Base System" + stage_prompt="Base-System Configuration" if arch-chroot /mnt <<-CONF > /dev/null 2>&1 ; then sed -i "/^#${SETLOCALE}/s/^#//" /etc/locale.gen || exit locale-gen || exit @@ -5410,7 +5457,7 @@ CONF btldrcfg() { if [[ "${bootloader}" == "1" ]]; then - local stage_prompt="Systemd-boot" + local stage_prompt="Systemd-boot Configuration" if [[ "${xbootloader}" == "no" ]]; then if arch-chroot /mnt <<-BOOTCTL > /dev/null 2>&1 ; then bootctl install || exit @@ -5431,7 +5478,7 @@ XBOOTCTL fi fi elif [[ "${bootloader}" == "2" ]]; then - local stage_prompt="Grub" + local stage_prompt="Grub Configuration" if arch-chroot /mnt <<-GRUB > /dev/null 2>&1 ; then cp /etc/default/grub /etc/default/grub.bak cat <<-CFG > /etc/default/grub || exit @@ -5478,7 +5525,7 @@ GRUBINST fi if [[ "${fs}" == "2" ]]; then - local stage_prompt="Grub-Btrfsd" + local stage_prompt="Grub-Btrfsd Service Activation" if arch-chroot /mnt <<-GRUB_BTRFSD > /dev/null 2>&1 ; then systemctl enable grub-btrfsd || exit GRUB_BTRFSD @@ -5489,7 +5536,7 @@ GRUB_BTRFSD fi if [[ "${vgaconf}" == "y" && "${vendor}" == "Nvidia" ]]; then - local stage_prompt="Grub-Nvidia" + local stage_prompt="Grub/Nvidia Configuration" if arch-chroot /mnt <<-NVGRUB > /dev/null 2>&1 ; then sed -i "/^#GRUB_TERMINAL_OUTPUT=console/s/^#//" /etc/default/grub || exit grub-mkconfig -o /boot/grub/grub.cfg || exit @@ -5505,7 +5552,7 @@ NVGRUB trimcfg() { if [[ -n "${trim}" ]]; then - local stage_prompt="Trim Service" + local stage_prompt="Trim Service Activation" if arch-chroot /mnt <<-TRIM > /dev/null 2>&1 ; then systemctl enable ${trim} || exit TRIM @@ -5519,7 +5566,7 @@ TRIM vm_serv() { if [[ -n "${vm_services}" ]]; then - local stage_prompt="VM Service(s)" + local stage_prompt="VM Service(s) Activation" if arch-chroot /mnt <<-VM > /dev/null 2>&1 ; then systemctl enable ${vm_services} || exit VM @@ -5533,7 +5580,7 @@ VM zramcfg() { if [[ -n "${zram}" ]]; then - local stage_prompt="Zram Swap" + local stage_prompt="Zram Swap Activation" zram_service="systemd-zram-setup@zram0.service" if arch-chroot /mnt <<-ZRAMCONF > /dev/null 2>&1 ; then mkdir -p /etc/systemd/zram-generator.conf.d @@ -5562,7 +5609,7 @@ nvidia_hook() { if [[ "${vgaconf}" == "y" && "${vendor}" == "Nvidia" ]]; then if [[ "${nvname}" == "nvidia-open" ]] || [[ "${nvname}" == "nvidia" ]] || [[ "${nvname}" == "nvidia-lts" ]]; then - local stage_prompt="Nvidia-Hook" + local stage_prompt="Nvidia Hook Creation" if arch-chroot /mnt <<-NVIDIAHOOK > /dev/null 2>&1 ; then mkdir -p /etc/pacman.d/hooks/ || exit cat <<-HOOK > /etc/pacman.d/hooks/nvidia.hook || exit @@ -5592,7 +5639,7 @@ NVIDIAHOOK ################################################################################################### mkinitcpio_preset() { - local stage_prompt="Mkinitcpio Kernel Presets" + local stage_prompt="Mkinitcpio Kernel Presets Configuration" if [[ "${uki}" == "y" ]]; then if [[ ! -e "${esp_mount}"/EFI/Linux ]]; then @@ -5643,7 +5690,7 @@ NOUKI secboot_sign() { if [[ ${sb_sign} == "y" ]]; then - local stage_prompt="Secure Boot Signing" + local stage_prompt="Secure-Boot Signing" if [[ ${bootloader} == "1" ]]; then if arch-chroot /mnt <<-SECSIGN > /dev/null 2>&1 ; then systemctl disable systemd-boot-update || exit @@ -5840,8 +5887,6 @@ chroot_conf() { sleep 0.2 NC " - - ${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}Chroot & Configure System${nc} ${magenta}]${nc}--------------------------------${magenta}###${nc} " @@ -5852,7 +5897,7 @@ ${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}Chroot & if [[ -f /mnt/etc/lightdm/lightdm.conf ]]; then if [[ "${packages}" == "7" ]]; then - local stage_prompt="Deepin Greeter" + local stage_prompt="Deepin Greeter Configuration" if arch-chroot /mnt <<-DEEPIN > /dev/null 2>&1 ; then sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-deepin-greeter|g' /etc/lightdm/lightdm.conf || exit DEEPIN @@ -5861,7 +5906,7 @@ DEEPIN stage_fail fi elif [[ "${packages}" == "5" || "${packages}" == "8" || "${packages}" == "10" ]]; then - local stage_prompt="GTK Greeter" + local stage_prompt="GTK Greeter Configuration" 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 GTK @@ -5870,7 +5915,7 @@ GTK stage_fail fi elif [[ "${packages}" == "6" ]]; then - local stage_prompt="Slick Greeter" + local stage_prompt="Slick Greeter Configuration" 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 SLICK @@ -5882,7 +5927,7 @@ SLICK fi if [[ -n "${bluetooth}" ]]; then - local stage_prompt="Bluetooth Service" + local stage_prompt="Bluetooth Service Activation" if arch-chroot /mnt <<-BLUETOOTH > /dev/null 2>&1 ; then systemctl enable ${bluetooth} || exit BLUETOOTH @@ -5893,7 +5938,7 @@ BLUETOOTH fi if [[ -n "${displaymanager}" ]]; then - local stage_prompt="Display Manager Service" + local stage_prompt="Display Manager Service Activation" if arch-chroot /mnt <<-DMSERVICE > /dev/null 2>&1 ; then systemctl enable ${displaymanager} || exit DMSERVICE @@ -5904,7 +5949,7 @@ DMSERVICE fi if [[ -n "${network}" ]]; then - local stage_prompt="Network Manager Service" + local stage_prompt="Network Manager Service Activation" if arch-chroot /mnt <<-NETWORK > /dev/null 2>&1 ; then systemctl enable ${network} || exit NETWORK @@ -5931,7 +5976,7 @@ NETWORK if [[ -f /mnt/etc/lightdm/lightdm.conf ]]; then if [[ "${greeternmbr}" == "1" ]]; then - local stage_prompt="GTK Greeter" + local stage_prompt="GTK Greeter Configuration" 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 GTK @@ -5940,7 +5985,7 @@ GTK stage_fail fi elif [[ "${greeternmbr}" == "2" ]]; then - local stage_prompt="Slick Greeter" + local stage_prompt="Slick Greeter Configuration" 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 SLICK @@ -5949,7 +5994,7 @@ SLICK stage_fail fi elif [[ "${greeternmbr}" == "3" ]]; then - local stage_prompt="Deepin Greeter" + local stage_prompt="Deepin Greeter Configuration" if arch-chroot /mnt <<-DEEPIN > /dev/null 2>&1 ; then sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-deepin-greeter|g' /etc/lightdm/lightdm.conf || exit DEEPIN @@ -5961,7 +6006,7 @@ DEEPIN fi if [[ -n "${customservices}" ]]; then - local stage_prompt="Custom Service(s)" + local stage_prompt="Custom Service(s) Activation" if arch-chroot /mnt <<-CUSTOMSERV > /dev/null 2>&1 ; then systemctl enable ${customservices} || exit CUSTOMSERV @@ -5983,7 +6028,7 @@ CUSTOMSERV #-------------------------------------------------------------------------------------------------- # Minimal Plasma/Gnome Optimized System Configuration: if [[ "${packages}" == "2" || "${packages}" == "4" ]]; then - local stage_prompt="Optimized System" + local stage_prompt="Optimized System Configuration" cnfg if [[ "${packages}" == "2" ]]; then