mirror of
				https://gitlab.com/prism7/archery.git
				synced 2025-02-15 08:29:17 +01:00 
			
		
		
		
	Change: Running 'pacman -Sy' earlier during the installation process might help avoiding package installation issues.
Change: A few prompts have been edited for better aesthetics.
This commit is contained in:
		
							
								
								
									
										10
									
								
								Amelia.sh
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								Amelia.sh
									
									
									
									
									
								
							| @@ -2,7 +2,7 @@ | ||||
|  | ||||
| # Amelia Installer | ||||
| # https://gitlab.com/prism7/archery | ||||
| # Version: 8.4.0 | ||||
| # Version: 8.4.1 | ||||
|  | ||||
|         set -euo pipefail | ||||
| ################################################################################################### | ||||
| @@ -1730,9 +1730,9 @@ Enter a number ${bwhite}(empty to skip)${blue}: " | ||||
|         >  Select Nvidia architecture: " | ||||
|             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 " | ||||
|  | ||||
|  | ||||
| @@ -5582,6 +5582,7 @@ PARALLEL | ||||
|             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 | ||||
|                 pacman -Syy || exit | ||||
| MULTILIB | ||||
|                 stage_ok | ||||
|             else | ||||
| @@ -5834,7 +5835,6 @@ secboot_sign() { | ||||
|         if [[ ${bootloader} == "1" ]]; then | ||||
|             if arch-chroot /mnt <<-SECSIGN > /dev/null 2>&1 2> amelia_log.txt ; then | ||||
|                 systemctl disable systemd-boot-update || exit | ||||
|                 pacman -Sy || exit | ||||
|                 pacman -S --noconfirm sbctl || exit | ||||
|                 sbctl create-keys || exit | ||||
|                 sbctl enroll-keys -m || exit | ||||
| @@ -5850,7 +5850,6 @@ SECSIGN | ||||
|             fi | ||||
|         elif [[ ${bootloader} == "2" ]]; then | ||||
|             if arch-chroot /mnt <<-SECSIGN > /dev/null 2>&1 2> amelia_log.txt ; then | ||||
|                 pacman -Sy || exit | ||||
|                 pacman -S --noconfirm sbctl || exit | ||||
|                 sbctl create-keys || exit | ||||
|                 sbctl enroll-keys -m || exit | ||||
| @@ -6363,6 +6362,7 @@ PARALLEL | ||||
|                 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 | ||||
|                     pacman -Syy || exit | ||||
| MULTILIB | ||||
|                     stage_ok | ||||
|                 else | ||||
|   | ||||
		Reference in New Issue
	
	Block a user