From 8e06374cb594e174e8002743fcf6a708d62332d6 Mon Sep 17 00:00:00 2001 From: Jane Doe Date: Sun, 19 Apr 2026 14:51:02 +0300 Subject: [PATCH] Add: Package 'kdiff3' has been added to 'Plasma Lite' installation Change: Indentation & prompts edits --- Amelia.sh | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/Amelia.sh b/Amelia.sh index a730d31..d04071d 100644 --- a/Amelia.sh +++ b/Amelia.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Amelia installer for Archlinux -# Version: 1.5.1 +# Version: 1.5.2 # Source: https://gitlab.com/prism7/archery # shellcheck disable=SC2154 @@ -259,14 +259,14 @@ failure() { filesystem_overview() { sleep 0.2 CYAN "\n\n###${nc}---------------------------------------------${cyan}[ ${bwhite}FILESYSTEM OVERVIEW ${nc}${cyan}]${nc}---------------------------------------------${cyan}###\n\n" - lsblk -f|GREP_COLORS='mt=01;36' grep -E --color=always 'vfat|$'|GREP_COLORS='mt=01;32' grep -E --color=always 'ext4|$'|GREP_COLORS='mt=01;35' grep -E --color=always 'btrfs|$'|GREP_COLORS='mt=01;31' grep -E --color=always 'ntfs|$'|GREP_COLORS='mt=01;33' grep -E --color=always 'swap|$' + lsblk -f | GREP_COLORS='mt=01;36' grep -E --color=always 'vfat|$' | GREP_COLORS='mt=01;32' grep -E --color=always 'ext4|$' | GREP_COLORS='mt=01;35' grep -E --color=always 'btrfs|$' | GREP_COLORS='mt=01;31' grep -E --color=always 'ntfs|$' | GREP_COLORS='mt=01;33' grep -E --color=always 'swap|$' CYAN "\n\n###${nc}-----------------------------------------------------------------------------------------------------------------${cyan}###\n" sleep 0.2 } disk_overview() { sleep 0.2 CYAN "\n\n\n###${nc}------------------------------------------------${cyan}[ ${bwhite}DISK OVERVIEW ${nc}${cyan}]${nc}------------------------------------------------${cyan}###\n\n" - fdisk -l "${instl_drive}" | grep -E --color=no 'Dev|dev' |GREP_COLORS='mt=01;36' grep -E --color=always 'EFI System|$'|GREP_COLORS='mt=01;32' grep -E --color=always 'Linux root|$'|GREP_COLORS='mt=01;35' grep -E --color=always 'Linux home|$'|GREP_COLORS='mt=01;33' grep -E --color=always 'Linux swap|$'|GREP_COLORS='mt=01;31' grep -E --color=always 'Linux extended boot|$' + fdisk -l "${instl_drive}" | grep -E --color=no 'Dev|dev' |GREP_COLORS='mt=01;36' grep -E --color=always 'EFI System|$' | GREP_COLORS='mt=01;32' grep -E --color=always 'Linux root|$' | GREP_COLORS='mt=01;35' grep -E --color=always 'Linux home|$' | GREP_COLORS='mt=01;33' grep -E --color=always 'Linux swap|$' | GREP_COLORS='mt=01;31' grep -E --color=always 'Linux extended boot|$' CYAN "\n\n###${nc}-----------------------------------------------------------------------------------------------------------------${cyan}###" } multi_info() { @@ -699,7 +699,7 @@ ask_sign() { printf "\n\n" failure fi - ack "Secure Boot Signing' has been selected" + ack "Secure Boot Signing has been selected" ask "Create an additional bootloader Rescue entry (for troubleshooting) ? [Y/n]" get "Enter [Y/n]" read -r -p "==> " setrescue @@ -737,10 +737,10 @@ slct_bootldr() { ack "Systemd-boot has been selected" local prompt="UKI(s) Auto-generation" CYAN "\n\n\n ### ${nc}UKIs can be generated for every additional Kernel installed\n\n${cyan} ### ${nc}Secure Boot signing will be performed automatically for all subsequent UKIs" - ask "Automate UKI(s) generation ? [Y/n]" - get "Enter [Y/n]" + ask "Automate UKI(s) generation ? [y/N]" + get "Enter [y/N]" read -r -p "==> " uki_use - uki_use="${uki_use:-y}" + uki_use="${uki_use:-n}" uki_use="${uki_use,,}" case "${uki_use}" in y) @@ -3608,7 +3608,7 @@ luks() { until luks; do : ; done fi fi - # NOTE: XBOOTLDR + # NOTE: Unencrypted XBOOTLDR if [[ "${xbootloader}" == "yes" ]] ; then if mkfs.fat -F 32 -n XBOOTLDR "${xboot_dev}" > "${void}" 2> "${log}" ; then mount --mkdir "${xboot_dev}" /mnt/boot > "${void}" 2> "${log}" || err_abort @@ -3627,7 +3627,6 @@ luks() { local prompt="Filesystems" ok keypress - blkid > "${void}" 2> "${log}" filesystem_overview } opt_pcmn() { @@ -3699,7 +3698,7 @@ pkg_collection() { deskpkgs="${basepkgs[*]} dolphin-plugins konsole plasma qt6-multimedia-gstreamer" displaymanager="plasmalogin" ;; 2) # Plasma Lite Desktop: - deskpkgs="${basepkgs[*]} ark bluedevil breeze-gtk colord-kde dolphin-plugins flatpak-kcm freerdp kate kcalc kclock kde-gtk-config kde-inotify-survey kdegraphics-mobipocket kdegraphics-thumbnailers kdenetwork-filesharing kdeplasma-addons kdf kdialog keditbookmarks kimageformats kio-admin kio-gdrive kio-zeroconf konsole krdc krfb kscreen kwayland-integration kwrited okular purpose ocean-sound-theme packagekit-qt6 partitionmanager plasma5-integration plasma-browser-integration plasma-desktop plasma-disks plasma-firewall plasma-keyboard plasma-login-manager plasma-nm plasma-pa plasma-systemmonitor plasma-wayland-protocols spectacle appmenu-gtk-module arj dosfstools ffmpegthumbs icoutils kvantum libappimage libappindicator lrzip lzop ntfs-3g power-profiles-daemon qrca qt5-xmlpatterns qt6-connectivity qt6-multimedia-gstreamer unarchiver unrar xdg-desktop-portal-gtk" + deskpkgs="${basepkgs[*]} ark bluedevil breeze-gtk colord-kde dolphin-plugins flatpak-kcm freerdp kate kcalc kclock kde-gtk-config kde-inotify-survey kdegraphics-mobipocket kdegraphics-thumbnailers kdenetwork-filesharing kdeplasma-addons kdf kdialog kdiff3 keditbookmarks kimageformats kio-admin kio-gdrive kio-zeroconf konsole krdc krfb kscreen kwayland-integration kwrited okular purpose ocean-sound-theme packagekit-qt6 partitionmanager plasma5-integration plasma-browser-integration plasma-desktop plasma-disks plasma-firewall plasma-keyboard plasma-login-manager plasma-nm plasma-pa plasma-systemmonitor plasma-wayland-protocols spectacle appmenu-gtk-module arj dosfstools ffmpegthumbs icoutils kvantum libappimage libappindicator lrzip lzop ntfs-3g power-profiles-daemon qrca qt5-xmlpatterns qt6-connectivity qt6-multimedia-gstreamer unarchiver unrar xdg-desktop-portal-gtk" displaymanager="plasmalogin" ;; 3) # Gnome Desktop: deskpkgs="${basepkgs[*]} gnome" @@ -3850,9 +3849,6 @@ pacstrap_system() { FSTAB_SBVL_MNT_OPTS ok fi - if [[ "${swapmode}" != "2" ]]; then - printf "\n\n" - fi } swapfile() { local prompt="Swapfile Setup" @@ -4535,7 +4531,7 @@ optimizations() { } view_optm() { if [[ "${sys_optm}" == "v" ]]; then - typeset -f optimizations | grep -E 'pacman|/pacman.conf|update-pciids|usermod|systemctl|/etc|/mkinitcpio.conf.d|/makepkg.conf.d|/sysctl.d|/polkit-1/rules.d|/systemd/journald.conf.d|/systemd/user.conf.d|/nanorc|/modules-load.d|/sudoers.d|/udisks2|/wpa_supplicant|/udev/rules.d' | less + typeset -f optimizations | grep -E 'pacman|/pacman.conf|/pacman.d/hooks|update-pciids|usermod|systemctl|/etc|/mkinitcpio.conf.d|/makepkg.conf.d|/sysctl.d|/polkit-1/rules.d|/systemd/journald.conf.d|/systemd/user.conf.d|/nanorc|/modules-load.d|/sudoers.d|/udisks2|/wpa_supplicant|/udev/rules.d' | less fi } secboot_sign() { @@ -4708,9 +4704,6 @@ set_vars() { mkinitcpio_hooks="HOOKS=(${HOOKS[*]})" } chroot_conf() { - if [[ "${swapmode}" == "2" ]]; then - printf "\n\n" - fi title "Chroot & Configure System" # NOTE: Desktops Configuration: if [[ "${desktop}" != "12" ]]; then