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

Remove: 'Pacman Optimization' stage: Removed all code enabling 'Pacman's Parallel Downloads' feature, as it has become the Default setting.

Browse Source 
Change: 'Graphics Setup' > Nvidia: Change when the prompt warning about Nvidia's proprietary 'Video Preserve/Resume' feature is presented
Change: Minor prompt editing for aesthetic purposes
This commit is contained in:
Jane Doe
2025-02-25 20:13:12 +00:00
parent e0902d0347
commit 510a06f745
1 changed files with 23 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Amelia.sh
+23 -84
View File
@@ -2,7 +2,7 @@
# Amelia Installer # Amelia Installer
# Source: https://gitlab.com/prism7/archery # Source: https://gitlab.com/prism7/archery
# Version: 8.8.0 # Version: 8.8.1
set -euo pipefail set -euo pipefail
################################################################################################### ###################################################################################################
@@ -1531,7 +1531,7 @@ dtct_single_vga() {
if [[ "${vendor}" == "Nvidia" ]]; then if [[ "${vendor}" == "Nvidia" ]]; then
YELLOW " YELLOW "
### Selecting 'n' defaults to using the open-source 'nouveau' driver" ### Selecting ${nc}'n' ${yellow}defaults to using the open-source ${nc}'nouveau' ${yellow}driver"
fi fi
BLUE " BLUE "
@@ -1767,6 +1767,24 @@ Enter a number ${bwhite}(empty to skip)${blue}: "
esac esac
elif [[ "${vendor}" == "Nvidia" ]]; then elif [[ "${vendor}" == "Nvidia" ]]; then
if [[ "${swapmode}" =~ ^(1|2|3)$ ]]; then
sleep 0.2
RED "
----------------------------------------------------------------
### ${yellowl}WARNING: ${nc}${yellow}When ${nc}Hibernating ${red}###
### ${yellow}Nvidia's ${nc}'Preserve Video Memory after suspend' ${yellow}feature ${red}###
### ${yellow}is incompatible with ${nc}'Early KMS' ${yellow}use ${red}###
----------------------------------------------------------------"
NC "
${bwhite}Press any key to continue${nc}
"
read -r -s -n 1
fi
sleep 0.2 sleep 0.2
YELLOW " YELLOW "
> Select Nvidia architecture: " > Select Nvidia architecture: "
@@ -1830,6 +1848,7 @@ Enter [y/n]: "
if [[ "${nogsp}" == "n" ]]; then if [[ "${nogsp}" == "n" ]]; then
skip skip
echo
elif [[ "${nogsp}" == "y" ]]; then elif [[ "${nogsp}" == "y" ]]; then
ok ok
echo echo
@@ -1844,18 +1863,6 @@ Enter [y/n]: "
invalid invalid
return 1 ;; return 1 ;;
esac esac
if [[ "${swapmode}" =~ ^(1|2|3)$ ]]; then
sleep 0.2
RED "
----------------------------------------------------------------
### ${yellowl}INFO: ${nc}${yellow}If ${nc}Hibernation ${yellow}is desired ${red}###
### ${yellow}Nvidia's ${nc}'Preserve video memory after suspend' ${yellow}feature ${red}###
### ${yellow}is incompatible with ${nc}'Early KMS' ${yellow}use ${nc}${red}###
----------------------------------------------------------------"
fi
fi fi
sleep 0.2 sleep 0.2
YELLOW " YELLOW "
@@ -4913,7 +4920,7 @@ ${magenta}###${nc}-------------------------------${magenta}[ ${bwhite}Confirm In
revise() { revise() {
revision="yes" revision="yes"
reset=(xbootloader="" vgaconf="" vendor_slct="" packages="" custompkgs="" customservices="" cust_bootopts="" REGDOM="" preset="" autoroot="" autoxboot="" autohome="" autoswap="") reset=(xbootloader="" vgaconf="" vendor_slct="" vendor="" packages="" custompkgs="" customservices="" cust_bootopts="" REGDOM="" preset="" autoroot="" autoxboot="" autohome="" autoswap="")
export "${reset[@]}" export "${reset[@]}"
if [[ "${hypervisor}" != "none" ]]; then if [[ "${hypervisor}" != "none" ]]; then
@@ -5281,63 +5288,6 @@ Enter country name or country code ${bwhite}(Empty for Defaults)${blue}: "
> Enable Pacman's ${nc}'Parallel Downloads' ${yellow}feature in the installed system ? [Y/n] "
BLUE "
Enter [Y/n]: "
read -r -p "
==> " parallel
echo
parallel="${parallel:-y}"
parallel="${parallel,,}"
if [[ "${parallel}" == "y" ]]; then
sleep 0.2
YELLOW "
> Select number of Parallel Downloads [Default: 3] "
NC "
${green}**${nc} [2]
${cyan}***${nc} ${bwhite}[3]
${nc}${yellow}****${nc} [4]
${red}*****${nc} [5] "
BLUE "
Enter a number: "
read -r -p "
==> " parallelnmbr
echo
parallelnmbr="${parallelnmbr:-3}"
parallelnmbr="${parallelnmbr,,}"
if [[ "${parallelnmbr}" =~ ^(2|3|4|5)$ ]]; then
sed -i "s|#ParallelDownloads = 5|ParallelDownloads = ${parallelnmbr}|g" /etc/pacman.conf > /dev/null 2> amelia_log.txt || err_abort
else
invalid
return 1
fi
sleep 0.2
NC "
==> [${green}${parallelnmbr} Parallel Downloads OK${nc}]"
elif [[ "${parallel}" == "n" ]]; then
skip
else
y_n
return 1
fi
YELLOW "
> Enable Pacman's ${nc}'Multilib' ${yellow}repository in the installed system ? [Y/n] " > Enable Pacman's ${nc}'Multilib' ${yellow}repository in the installed system ? [Y/n] "
BLUE " BLUE "
@@ -5860,17 +5810,6 @@ NOUKI
################################################################################################### ###################################################################################################
var_opts() { var_opts() {
if [[ "${parallel}" == "y" ]]; then
local 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 if [[ "${multilib}" == "y" ]]; then
local stage_prompt="Multilib Configuration" local stage_prompt="Multilib Configuration"
if arch-chroot /mnt <<-MULTILIB > /dev/null 2>&1 2> amelia_log.txt ; then if arch-chroot /mnt <<-MULTILIB > /dev/null 2>&1 2> amelia_log.txt ; then
@@ -6476,7 +6415,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="" parallel="" parallelnmbr="" multilib="" nvname="" nogsp="" luks_root="" luks_swap="" luks_home="" installation="" kill_watchdog="" oomd="") 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="" nvname="" nogsp="" luks_root="" luks_swap="" luks_home="" installation="" kill_watchdog="" oomd="")
export "${vars[@]}" export "${vars[@]}"
clear clear
first_check first_check