Browse Source

fix typo in environment variable for automatic reboots

consolidate redundant gpu packages into below pacman command
Casey DeLorme 2 years ago
parent
commit
6c8513c371
2 changed files with 5 additions and 5 deletions
  1. 4 4
      arch.sh
  2. 1 1
      setup/install.sh

+ 4 - 4
arch.sh

@@ -82,17 +82,17 @@ sed -i 's/^#MAKEFLAGS.*/MAKEFLAGS="-j$(($(nproc) + 1)) -l$(nproc)"/' /etc/makepk
 
 # install GPU related packages
 if [ $(lspci | grep -i "vga" | grep -ci "amd") -gt 0 ]; then
-	pacman -Syu --noconfirm xf86-video-amdgpu vulkan-radeon lib32-vulkan-radeon libva-mesa-driver lib32-libva-mesa-driver mesa-vdpau lib32-mesa-vdpau vulkan-tools vulkan-icd-loader lib32-vulkan-icd-loader
+	pacman -Syu --noconfirm xf86-video-amdgpu vulkan-radeon lib32-vulkan-radeon mesa-vdpau
 
 	# update modules to load
 	[ $(grep -c "amd" /etc/mkinitcpio.conf) -eq 0 ] && sed -i 's/MODULES=(\(.*\))/MODULES=(\1 amdgpu radeon)/' /etc/mkinitcpio.conf
 elif [ $(lspci | grep -i "vga" | grep -ci "intel") -gt 0 ]; then
-	pacman -Syu --noconfirm xf86-video-intel vulkan-intel lib32-vulkan-intel libva-mesa-driver lib32-libva-mesa-driver mesa-vdpau lib32-mesa-vdpau vulkan-tools vulkan-icd-loader lib32-vulkan-icd-loader
+	pacman -Syu --noconfirm xf86-video-intel vulkan-intel lib32-vulkan-intel mesa-vdpau
 
 	# update modules to load
 	[ $(grep -c "amd" /etc/mkinitcpio.conf) -eq 0 ] && sed -i 's/MODULES=(\(.*\))/MODULES=(\1 i915)/' /etc/mkinitcpio.conf
 elif [ $(lspci | grep -i "vga" | grep -ci "nvidia") -gt 0 ]; then
-	pacman -Syu --noconfirm nvidia-dkms libglvnd lib32-libglvnd opencl-nvidia lib32-opencl-nvidia xf86-video-nouveau nvidia-utils lib32-nvidia-utils libva-mesa-driver lib32-libva-mesa-driver mesa-vdpau lib32-mesa-vdpau vulkan-tools vulkan-icd-loader lib32-vulkan-icd-loader nvidia-settings
+	pacman -Syu --noconfirm nvidia-dkms libglvnd lib32-libglvnd opencl-nvidia lib32-opencl-nvidia xf86-video-nouveau nvidia-utils lib32-nvidia-utils mesa-vdpau nvidia-settings
 
 	# update modules to load
 	[ $(grep -c "nvidia" /etc/mkinitcpio.conf) -eq 0 ] && sed -i 's/MODULES=(\(.*\))/MODULES=(\1 nvidia nvidia_modeset nvidia_uvm nvidia_drm)/' /etc/mkinitcpio.conf
@@ -102,7 +102,7 @@ elif [ $(lspci | grep -i "vga" | grep -ci "nvidia") -gt 0 ]; then
 fi
 
 # install packages dependent on gpu packages
-pacman -Syu --noconfirm firefox obs-studio dia mednafen mame ppsspp lutris wine-staging winetricks steam discord
+pacman -Syu --noconfirm firefox obs-studio dia mednafen mame ppsspp lutris wine-staging winetricks steam discord libva-mesa-driver lib32-libva-mesa-driver lib32-mesa-vdpau vulkan-tools vulkan-icd-loader lib32-vulkan-icd-loader
 
 # install laptop packages and optimize system configuration
 # @note: alternatively if `/sys/class/power_supply/BAT0` exists, we have a battery, probably laptop

+ 1 - 1
setup/install.sh

@@ -105,7 +105,7 @@ if [ $(dmesg | grep -ci "hypervisor") -gt 0 ]; then
 fi
 
 # if auto-reboot is enabled then unmount and automatically reboot
-if [ -n "AUTOREBOOT" ]; then
+if [ -n "$AUTOREBOOT" ]; then
 	sync
 	umount -R /mnt
 	(sleep 5 && systemctl reboot) &