x/archery
1
0
Fork 0
mirror of https://gitlab.com/prism7/archery.git synced 2026-04-28 17:37:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

v. 9.9.3

Browse Source 
Add: The package 'usb_modeswitch' has been added.
Change: 'Systemd-boot': If 'Secureboot Signing' has been selected: The 'systemd-boot-update' service is re-enabled and 'sbctl' will be set to sign the boot manager directly instead.
Change: Some prompts have been edited for better aesthetics
This commit is contained in:
Jane Doe
2025-10-15 13:54:28 +03:00
parent 5a31c901d2
commit 0c77626a03
1 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Amelia.sh
+11 -24
View File
@@ -2,7 +2,7 @@
# Amelia Installer # Amelia Installer
# Source: https://gitlab.com/prism7/archery # Source: https://gitlab.com/prism7/archery
# Version: 9.9.2 # Version: 9.9.3
set -euo pipefail set -euo pipefail
################################################################################################### ###################################################################################################
@@ -1572,11 +1572,7 @@ dtct_gfx() {
if [[ "${vendor}" == "Virtual Machine" ]]; then if [[ "${vendor}" == "Virtual Machine" ]]; then
vm vm
sleep 0.2 skip
YELLOW "
--> Graphics Setup skipped
"
return 0 return 0
fi fi
sleep 0.2 sleep 0.2
@@ -2487,11 +2483,7 @@ boot_entr() {
if [[ "${vendor}" == "Virtual Machine" ]]; then if [[ "${vendor}" == "Virtual Machine" ]]; then
efi_entr_del="yes" efi_entr_del="yes"
vm vm
sleep 0.2 skip
YELLOW "
--> EFI Boot Entries Deletion skipped
"
return 0 return 0
fi fi
@@ -2817,11 +2809,7 @@ ask_wireless_regdom() {
if [[ "${vendor}" == "Virtual Machine" ]]; then if [[ "${vendor}" == "Virtual Machine" ]]; then
vm vm
sleep 0.2 skip
YELLOW "
--> Wireless Regulatory Domain Setup skipped
"
return 0 return 0
fi fi
@@ -3507,7 +3495,7 @@ ${magenta}###${nc}---------------------------------${magenta}[ ${bwhite}Automati
sleep 0.2 sleep 0.2
CYAN " 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 " BLUE "
@@ -4277,7 +4265,7 @@ ${multi_swap}
sleep 0.2 sleep 0.2
RED " RED "
--------------------------------------------------- ---------------------------------------------------
### ${yellow}Linux x86-64 /Root ${nc}Partition not detected ${red}### ### ${yellowl}Linux x86-64 /Root ${nc}Partition not detected ${red}###
---------------------------------------------------" ---------------------------------------------------"
fi fi
#.................................................................................................. #..................................................................................................
@@ -4287,7 +4275,7 @@ ${multi_swap}
sleep 0.2 sleep 0.2
RED " RED "
------------------------------------------- -------------------------------------------
### ${yellow}EFI System ${nc}Partition not detected ${red}### ### ${yellowl}EFI System ${nc}Partition not detected ${red}###
-------------------------------------------" -------------------------------------------"
fi fi
@@ -4366,7 +4354,7 @@ ${multi_swap}
sleep 0.2 sleep 0.2
RED " RED "
---------------------------------------------------- ----------------------------------------------------
### ${yellow}Linux Extended Boot ${nc}Partition not detected ${red}### ### ${yellowl}Linux Extended Boot ${nc}Partition not detected ${red}###
----------------------------------------------------" ----------------------------------------------------"
fi fi
elif [[ "${multibooting}" == "n" ]]; then elif [[ "${multibooting}" == "n" ]]; then
@@ -4435,7 +4423,7 @@ ${multi_swap}
sleep 0.2 sleep 0.2
RED " RED "
-------------------------------------------- --------------------------------------------
### ${yellow}Linux /Home ${nc}Partition not detected ${red}### ### ${yellowl}Linux /Home ${nc}Partition not detected ${red}###
--------------------------------------------" --------------------------------------------"
fi fi
fi fi
@@ -4465,7 +4453,7 @@ ${multi_swap}
sleep 0.2 sleep 0.2
RED " RED "
-------------------------------------------- --------------------------------------------
### ${yellow}Linux /Swap ${nc}Partition not detected ${red}### ### ${yellowl}Linux /Swap ${nc}Partition not detected ${red}###
--------------------------------------------" --------------------------------------------"
fi fi
fi fi
@@ -6280,7 +6268,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs
basepkgs+=(alsa-firmware linux-firmware sof-firmware) basepkgs+=(alsa-firmware linux-firmware sof-firmware)
fi fi
if [[ ! "${desktop}" =~ ^(11|12)$ ]]; then 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 fi
if [[ "${terminal}" == "y" ]]; then if [[ "${terminal}" == "y" ]]; then
basepkgs+=(gnome-terminal) basepkgs+=(gnome-terminal)
@@ -7108,7 +7096,6 @@ secboot_sign() {
local stage_prompt="Secure-Boot Signing" local stage_prompt="Secure-Boot Signing"
if [[ "${bootloader}" == "1" ]]; then if [[ "${bootloader}" == "1" ]]; then
if arch-chroot /mnt <<-SECSIGN > "${void}" 2>&1 2> "${log}" ; then if arch-chroot /mnt <<-SECSIGN > "${void}" 2>&1 2> "${log}" ; then
systemctl disable systemd-boot-update || exit
pacman -S --noconfirm sbctl || exit pacman -S --noconfirm sbctl || exit
sbctl create-keys || exit sbctl create-keys || exit
sbctl enroll-keys -m || exit sbctl enroll-keys -m || exit