Add: The following packages have been added in their respective/involved setups: 'intel-compute-runtime', 'opencl-headers', 'rocm-opencl-runtime'

Add: The user can now select if the installer should enable 'Parallel Downloads' & 'Multilib Repository' in the installed system.
Change: Some prompts have been edited for better aesthetics
This commit is contained in:
Jane Doe 2025-01-07 13:41:03 +00:00
parent 4e6f895bb1
commit 8a2a677a15

View file

@ -2,7 +2,7 @@
# Amelia Installer # Amelia Installer
# https://gitlab.com/prism7/archery # https://gitlab.com/prism7/archery
# Version: 8.3.5 # Version: 8.3.6
set -euo pipefail set -euo pipefail
################################################################################################### ###################################################################################################
@ -1684,9 +1684,9 @@ vga_conf() {
if [[ "${vgaconf}" == "y" ]]; then if [[ "${vgaconf}" == "y" ]]; then
if [[ "${vendor}" == "Intel" ]]; then if [[ "${vendor}" == "Intel" ]]; then
perf_stream="dev.i915.perf_stream_paranoid = 0" perf_stream="dev.i915.perf_stream_paranoid = 0"
vgapkgs="intel-media-driver intel-media-sdk libva-intel-driver vpl-gpu-rt vkd3d vulkan-intel vulkan-mesa-layers" vgapkgs="intel-compute-runtime intel-media-driver intel-media-sdk libva-intel-driver opencl-headers vpl-gpu-rt vkd3d vulkan-intel vulkan-mesa-layers"
elif [[ "${vendor}" == "AMD" ]]; then elif [[ "${vendor}" == "AMD" ]]; then
vgapkgs="libva-mesa-driver mesa-vdpau vkd3d vulkan-mesa-layers vulkan-radeon" vgapkgs="libva-mesa-driver mesa-vdpau opencl-headers rocm-opencl-runtime vkd3d vulkan-mesa-layers vulkan-radeon"
sleep 0.2 sleep 0.2
YELLOW " YELLOW "
@ -1752,10 +1752,10 @@ Enter a number: "
# Linux Kernel # Linux Kernel
if [[ "${kernelnmbr}" == "1" ]]; then if [[ "${kernelnmbr}" == "1" ]]; then
nvname="nvidia-open" nvname="nvidia-open"
vgapkgs="libva-nvidia-driver libvdpau-va-gl nvidia-open nvidia-settings nvidia-utils opencl-nvidia vkd3d" vgapkgs="libva-nvidia-driver libvdpau-va-gl nvidia-open nvidia-settings nvidia-utils opencl-nvidia opencl-headers vkd3d"
# Other Kernels # Other Kernels
else else
vgapkgs="libva-nvidia-driver libvdpau-va-gl nvidia-open-dkms nvidia-settings nvidia-utils opencl-nvidia vkd3d" vgapkgs="libva-nvidia-driver libvdpau-va-gl nvidia-open-dkms nvidia-settings nvidia-utils opencl-nvidia opencl-headers vkd3d"
fi ;; fi ;;
2) # Maxwell+ Family 2) # Maxwell+ Family
sleep 0.2 sleep 0.2
@ -1766,14 +1766,14 @@ Enter a number: "
# Linux Kernel # Linux Kernel
if [[ "${kernelnmbr}" == "1" ]]; then if [[ "${kernelnmbr}" == "1" ]]; then
nvname="nvidia" nvname="nvidia"
vgapkgs="libva-nvidia-driver libvdpau-va-gl nvidia nvidia-settings nvidia-utils opencl-nvidia vkd3d" vgapkgs="libva-nvidia-driver libvdpau-va-gl nvidia nvidia-settings nvidia-utils opencl-nvidia opencl-headers vkd3d"
# Linux LTS Kernel # Linux LTS Kernel
elif [[ "${kernelnmbr}" == "2" ]]; then elif [[ "${kernelnmbr}" == "2" ]]; then
nvname="nvidia-lts" nvname="nvidia-lts"
vgapkgs="libva-nvidia-driver libvdpau-va-gl nvidia-lts nvidia-settings nvidia-utils opencl-nvidia vkd3d" vgapkgs="libva-nvidia-driver libvdpau-va-gl nvidia-lts nvidia-settings nvidia-utils opencl-nvidia opencl-headers vkd3d"
# Other Kernels # Other Kernels
else else
vgapkgs="libva-nvidia-driver libvdpau-va-gl nvidia-dkms nvidia-settings nvidia-utils opencl-nvidia vkd3d" vgapkgs="libva-nvidia-driver libvdpau-va-gl nvidia-dkms nvidia-settings nvidia-utils opencl-nvidia opencl-headers vkd3d"
fi ;; fi ;;
"") "")
choice choice
@ -5208,7 +5208,8 @@ Enter country name or country code ${bwhite}(Empty for Defaults)${blue}: "
YELLOW " YELLOW "
> Enable Pacman's ${nc}'Parallel Downloads' ${yellow}feature ? [Y/n] "
> Enable Pacman's ${nc}'Parallel Downloads' ${yellow}feature in the installed system ? [Y/n] "
BLUE " BLUE "
@ -5261,6 +5262,34 @@ Enter a number: "
y_n y_n
return 1 return 1
fi fi
YELLOW "
> Enable Pacman's ${nc}'Multilib' ${yellow}repository in the installed system ? [Y/n] "
BLUE "
Enter [Y/n]: "
read -r -p "
==> " multilib
echo
multilib="${multilib:-y}"
multilib="${multilib,,}"
if [[ "${multilib}" == "y" ]]; then
sleep 0.2
NC "
==> [${green}Multilib repository OK${nc}]"
elif [[ "${multilib}" == "n" ]]; then
skip
else
y_n
return 1
fi
ok ok
} }
################################################################################################### ###################################################################################################
@ -5517,6 +5546,27 @@ HOSTS
visudo -c /etc/sudoers.d/sudoersd || exit visudo -c /etc/sudoers.d/sudoersd || exit
CONF CONF
stage_ok stage_ok
if [[ "${parallel}" == "y" ]]; then
stage_prompt="Parallel Downloads Configuration"
if arch-chroot /mnt <<-PARALLEL > /dev/null 2>&1 2> amelia_log.txt ; then
sed -i "s|#ParallelDownloads = 5|ParallelDownloads = ${parallelnmbr}|g" /etc/pacman.conf || exit
PARALLEL
stage_ok
else
stage_fail
fi
fi
if [[ "${multilib}" == "y" ]]; then
stage_prompt="Multilib Configuration"
if arch-chroot /mnt <<-MULTILIB > /dev/null 2>&1 2> amelia_log.txt ; then
sed -i "/\[multilib\]/,/Include/"'s/^#//' /etc/pacman.conf || exit
MULTILIB
stage_ok
else
stage_fail
fi
fi
else else
stage_fail stage_fail
fi fi
@ -6131,7 +6181,6 @@ CUSTOMSERV
export LANG=${SETLOCALE} || exit export LANG=${SETLOCALE} || exit
echo KEYMAP=${SETKBD} > /etc/vconsole.conf || exit echo KEYMAP=${SETKBD} > /etc/vconsole.conf || exit
sed -i 's/^#Color/Color\nILoveCandy/' /etc/pacman.conf || exit sed -i 's/^#Color/Color\nILoveCandy/' /etc/pacman.conf || exit
sed -i "/^#ParallelDownloads = 5/s/^#//" /etc/pacman.conf || exit
update-pciids || exit update-pciids || exit
cat <<-MKINITCPIO > /etc/mkinitcpio.conf.d/mkinitcpiod.conf || exit cat <<-MKINITCPIO > /etc/mkinitcpio.conf.d/mkinitcpiod.conf || exit
${mkinitcpio_mods} ${mkinitcpio_mods}
@ -6268,6 +6317,27 @@ SUDOERS
systemctl enable avahi-daemon bluetooth cups ipp-usb NetworkManager rngd ${displaymanager} ${trim} ${vm_services} || exit systemctl enable avahi-daemon bluetooth cups ipp-usb NetworkManager rngd ${displaymanager} ${trim} ${vm_services} || exit
OPTIMIZED OPTIMIZED
stage_ok stage_ok
if [[ "${parallel}" == "y" ]]; then
stage_prompt="Parallel Downloads Configuration"
if arch-chroot /mnt <<-PARALLEL > /dev/null 2>&1 2> amelia_log.txt ; then
sed -i "s|#ParallelDownloads = 5|ParallelDownloads = ${parallelnmbr}|g" /etc/pacman.conf || exit
PARALLEL
stage_ok
else
stage_fail
fi
fi
if [[ "${multilib}" == "y" ]]; then
stage_prompt="Multilib Configuration"
if arch-chroot /mnt <<-MULTILIB > /dev/null 2>&1 2> amelia_log.txt ; then
sed -i "/\[multilib\]/,/Include/"'s/^#//' /etc/pacman.conf || exit
MULTILIB
stage_ok
else
stage_fail
fi
fi
else else
stage_fail stage_fail
fi fi
@ -6291,7 +6361,7 @@ OPTIMIZED
tty="$(tty)" tty="$(tty)"
disks="$(lsblk --nodeps --paths --noheadings --output=name,size,model | cat --number)" disks="$(lsblk --nodeps --paths --noheadings --output=name,size,model | cat --number)"
trg="" trg=""
vars=(LOCALESET="" SETLOCALE="" lcl_slct="" USERNAME="" kernelnmbr="" fs="" vgapkgs="" vgacount="" vgacard="" intelcount="" intelcards="" nvidiacount="" nvidiacards="" amdcount="" amdcards="" vgaconf="" vga_conf="" vga_setup="" vendor="" vendor1="" vendor2="" vendor3="" vendor_slct="" packages="" efi_entr_del="" wrlss_rgd="" sanity="" install="" bootldr_pkgs="" devel="" REGDOM="" vga_bootopts="" btrfs_bootopts="" trim="" swapmode="" homecrypt="" greeter="" revision="" greeternmbr="" cust_bootopts="" bluetooth="" vmpkgs="" vm_services="" perf_stream="" displaymanager="" wireless_reg="" bitness="" bootloader="" vga_slct="" espsize="" autoroot="" autoesp="" autoxboot="" autohome="" autoswap="" rootprt="" espprt="" xbootprt="" homeprt="" swapprt="" partok="" use_manpreset="" instl_drive="" sgdsk_nmbr="" part_mode="" preset="" capacity="" cap_gib="" rootsize="" sgdrive="" cgdrive="" smartpart="" presetpart="" prcnt="" roottype="" stage_prompt="" zram="" zram_bootopts="" xbootloader="" multibooting="" hypervisor="" mkinitcpio_mods="" uki="" ukify="" slct_autoprt="" cng_espmnt="" sep_home="" encr_swap_bootopts="" uefimode="" luks_encrypt="" nrg_plc="") vars=(LOCALESET="" SETLOCALE="" lcl_slct="" USERNAME="" kernelnmbr="" fs="" vgapkgs="" vgacount="" vgacard="" intelcount="" intelcards="" nvidiacount="" nvidiacards="" amdcount="" amdcards="" vgaconf="" vga_conf="" vga_setup="" vendor="" vendor1="" vendor2="" vendor3="" vendor_slct="" packages="" efi_entr_del="" wrlss_rgd="" sanity="" install="" bootldr_pkgs="" devel="" REGDOM="" vga_bootopts="" btrfs_bootopts="" trim="" swapmode="" homecrypt="" greeter="" revision="" greeternmbr="" cust_bootopts="" bluetooth="" vmpkgs="" vm_services="" perf_stream="" displaymanager="" wireless_reg="" bitness="" bootloader="" vga_slct="" espsize="" autoroot="" autoesp="" autoxboot="" autohome="" autoswap="" rootprt="" espprt="" xbootprt="" homeprt="" swapprt="" partok="" use_manpreset="" instl_drive="" sgdsk_nmbr="" part_mode="" preset="" capacity="" cap_gib="" rootsize="" sgdrive="" cgdrive="" smartpart="" presetpart="" prcnt="" roottype="" stage_prompt="" zram="" zram_bootopts="" xbootloader="" multibooting="" hypervisor="" mkinitcpio_mods="" uki="" ukify="" slct_autoprt="" cng_espmnt="" sep_home="" encr_swap_bootopts="" uefimode="" luks_encrypt="" nrg_plc="" multilib="")
export "${vars[@]}" export "${vars[@]}"
clear clear
first_check first_check