albert/archery
1
0
Fork 0
mirror of https://gitlab.com/prism7/archery.git synced 2025-02-15 08:29:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change: Running 'pacman -Sy' earlier during the installation process might help avoiding package installation issues.

Browse source 
Change: A few prompts have been edited for better aesthetics.
This commit is contained in:
Jane Doe 2025-01-11 11:07:45 +00:00
parent 6d04d3e877
commit d8ba025b8f
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Amelia.sh
View file

@ -2,7 +2,7 @@
# Amelia Installer # Amelia Installer
# https://gitlab.com/prism7/archery # https://gitlab.com/prism7/archery
# Version: 8.4.0 # Version: 8.4.1
set -euo pipefail set -euo pipefail
################################################################################################### ###################################################################################################
@ -1730,9 +1730,9 @@ Enter a number ${bwhite}(empty to skip)${blue}: "
> Select Nvidia architecture: " > Select Nvidia architecture: "
NC " NC "
[1] NV160 (Turing) Graphics or newer [Nvidia Open Drivers] [1] Turing (NV160) Graphics or newer [Nvidia Open]
[2] NV110 (Maxwell) Graphics or newer [Nvidia Proprietary Drivers] " [2] Maxwell (NV110) Graphics or newer [Nvidia Proprietary / Disabling GSP Firmware available] "
BLUE " BLUE "
@ -5582,6 +5582,7 @@ PARALLEL
stage_prompt="Multilib Configuration" 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
sed -i "/\[multilib\]/,/Include/"'s/^#//' /etc/pacman.conf || exit sed -i "/\[multilib\]/,/Include/"'s/^#//' /etc/pacman.conf || exit
pacman -Syy || exit
MULTILIB MULTILIB
stage_ok stage_ok
else else
@ -5834,7 +5835,6 @@ secboot_sign() {
if [[ ${bootloader} == "1" ]]; then if [[ ${bootloader} == "1" ]]; then
if arch-chroot /mnt <<-SECSIGN > /dev/null 2>&1 2> amelia_log.txt ; then if arch-chroot /mnt <<-SECSIGN > /dev/null 2>&1 2> amelia_log.txt ; then
systemctl disable systemd-boot-update || exit systemctl disable systemd-boot-update || exit
pacman -Sy || 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
@ -5850,7 +5850,6 @@ SECSIGN
fi fi
elif [[ ${bootloader} == "2" ]]; then elif [[ ${bootloader} == "2" ]]; then
if arch-chroot /mnt <<-SECSIGN > /dev/null 2>&1 2> amelia_log.txt ; then if arch-chroot /mnt <<-SECSIGN > /dev/null 2>&1 2> amelia_log.txt ; then
pacman -Sy || 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
@ -6363,6 +6362,7 @@ PARALLEL
stage_prompt="Multilib Configuration" 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
sed -i "/\[multilib\]/,/Include/"'s/^#//' /etc/pacman.conf || exit sed -i "/\[multilib\]/,/Include/"'s/^#//' /etc/pacman.conf || exit
pacman -Syy || exit
MULTILIB MULTILIB
stage_ok stage_ok
else else