diff --git a/Amelia.sh b/Amelia.sh index d3c5be7..0dbf931 100644 --- a/Amelia.sh +++ b/Amelia.sh @@ -2,7 +2,7 @@ # Amelia Installer # Source: https://gitlab.com/prism7/archery -# Version: 9.9.2 +# Version: 9.9.3 set -euo pipefail ################################################################################################### @@ -1572,11 +1572,7 @@ dtct_gfx() { if [[ "${vendor}" == "Virtual Machine" ]]; then vm - sleep 0.2 - YELLOW " - - --> Graphics Setup skipped - " + skip return 0 fi sleep 0.2 @@ -2487,11 +2483,7 @@ boot_entr() { if [[ "${vendor}" == "Virtual Machine" ]]; then efi_entr_del="yes" vm - sleep 0.2 - YELLOW " - - --> EFI Boot Entries Deletion skipped - " + skip return 0 fi @@ -2817,11 +2809,7 @@ ask_wireless_regdom() { if [[ "${vendor}" == "Virtual Machine" ]]; then vm - sleep 0.2 - YELLOW " - - --> Wireless Regulatory Domain Setup skipped - " + skip return 0 fi @@ -3507,7 +3495,7 @@ ${magenta}###${nc}---------------------------------${magenta}[ ${bwhite}Automati sleep 0.2 CYAN " - >>> ${nc}Apply ${yellowl}'Smart Partitioning' ${nc}on disk ${bwhite}'${instl_drive}'${nc} ? ${cyan}[Y/n] " + >> ${nc}Apply ${yellowl}'Smart Partitioning' ${nc}on disk ${bwhite}'${instl_drive}'${nc} ? ${cyan}[Y/n] " BLUE " @@ -4277,7 +4265,7 @@ ${multi_swap} sleep 0.2 RED " --------------------------------------------------- - ### ${yellow}Linux x86-64 /Root ${nc}Partition not detected ${red}### + ### ${yellowl}Linux x86-64 /Root ${nc}Partition not detected ${red}### ---------------------------------------------------" fi #.................................................................................................. @@ -4287,7 +4275,7 @@ ${multi_swap} sleep 0.2 RED " ------------------------------------------- - ### ${yellow}EFI System ${nc}Partition not detected ${red}### + ### ${yellowl}EFI System ${nc}Partition not detected ${red}### -------------------------------------------" fi @@ -4366,7 +4354,7 @@ ${multi_swap} sleep 0.2 RED " ---------------------------------------------------- - ### ${yellow}Linux Extended Boot ${nc}Partition not detected ${red}### + ### ${yellowl}Linux Extended Boot ${nc}Partition not detected ${red}### ----------------------------------------------------" fi elif [[ "${multibooting}" == "n" ]]; then @@ -4435,7 +4423,7 @@ ${multi_swap} sleep 0.2 RED " -------------------------------------------- - ### ${yellow}Linux /Home ${nc}Partition not detected ${red}### + ### ${yellowl}Linux /Home ${nc}Partition not detected ${red}### --------------------------------------------" fi fi @@ -4465,7 +4453,7 @@ ${multi_swap} sleep 0.2 RED " -------------------------------------------- - ### ${yellow}Linux /Swap ${nc}Partition not detected ${red}### + ### ${yellowl}Linux /Swap ${nc}Partition not detected ${red}### --------------------------------------------" fi fi @@ -6280,7 +6268,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs basepkgs+=(alsa-firmware linux-firmware sof-firmware) fi if [[ ! "${desktop}" =~ ^(11|12)$ ]]; then - basepkgs+=(7zip alsa-utils bluez bluez-hid2hci bluez-obex bluez-utils exfatprogs git glibc-locales gst-libav gst-plugin-libcamera gst-plugin-pipewire gst-plugins-bad gst-plugins-good gst-plugins-ugly libfido2 man-db man-pages mesa-utils nano-syntax-highlighting pacman-contrib pipewire-alsa pipewire-libcamera pipewire-pulse pipewire-zeroconf reflector xdg-user-dirs) + basepkgs+=(7zip alsa-utils bluez bluez-hid2hci bluez-obex bluez-utils exfatprogs git glibc-locales gst-libav gst-plugin-libcamera gst-plugin-pipewire gst-plugins-bad gst-plugins-good gst-plugins-ugly libfido2 man-db man-pages mesa-utils nano-syntax-highlighting pacman-contrib pipewire-alsa pipewire-libcamera pipewire-pulse pipewire-zeroconf reflector usb_modeswitch xdg-user-dirs) fi if [[ "${terminal}" == "y" ]]; then basepkgs+=(gnome-terminal) @@ -7108,7 +7096,6 @@ secboot_sign() { local stage_prompt="Secure-Boot Signing" if [[ "${bootloader}" == "1" ]]; then if arch-chroot /mnt <<-SECSIGN > "${void}" 2>&1 2> "${log}" ; then - systemctl disable systemd-boot-update || exit pacman -S --noconfirm sbctl || exit sbctl create-keys || exit sbctl enroll-keys -m || exit