From 55ef4503a58eb2ad39f776e09183d6a875f5fe35 Mon Sep 17 00:00:00 2001
From: natemaia <natemaia10@gmail.com>
Date: Wed, 1 Jul 2020 18:54:29 -0700
Subject: [PATCH] Package changes

---
 installer | 31 ++++++++-----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/installer b/installer
index ef30e68..72e262d 100755
--- a/installer
+++ b/installer
@@ -6,7 +6,7 @@
 # AIF, Calamares, and the Arch Wiki.. Credit where credit is due
 
 # shellcheck disable=SC2086,SC2046,SC2254,SC2164
-VER=2.1.61
+VER=2.1.62
 
 # default values {
 
@@ -70,23 +70,8 @@ typeset -a BASE_PKGS=(
 "scrot"
 "sudo"
 "xdg-user-dirs"
+"xorg"
 "xorg-drivers" # TODO: should we only install specific drivers?
-"xorg-font-utils"
-"xorg-iceauth"
-"xorg-server"
-"xorg-server-common"
-"xorg-setxkbmap"
-"xorg-xauth"
-"xorg-xbacklight"
-"xorg-xinput"
-"xorg-xkbcomp"
-"xorg-xkill"
-"xorg-xmodmap"
-"xorg-xprop"
-"xorg-xrandr"
-"xorg-xrdb"
-"xorg-xset"
-"xorg-xsetroot"
 "xterm"
 ) # }
 
@@ -2017,12 +2002,12 @@ install_packages()
 	if [[ $PACSTRAP -eq 1 ]]; then
 		blk="$(lsblk -f)"
 		lspci | grep -qi 'broadcom' && inpkg+=('b43-firmware' 'b43-fwcutter' 'broadcom-wl')
-		grep -qi 'ntfs' <<< "$blk" && inpkg+=('ntfs-3g')
-		grep -qi 'jfs' <<< "$blk" && inpkg+=('jfsutils')
-		grep -qi 'xfs' <<< "$blk" && inpkg+=('xfsprogs')
-		grep -qi 'reiserfs' <<< "$blk" && inpkg+=('reiserfsprogs')
+		[[ $blk =~ ntfs ]] && inpkg+=('ntfs-3g')
+		[[ $blk =~ jfs ]] && inpkg+=('jfsutils')
+		[[ $blk =~ xfs ]] && inpkg+=('xfsprogs')
+		[[ $blk =~ reiserfs ]] <<< "$blk" && inpkg+=('reiserfsprogs')
 		[[ $LVM ]] && inpkg+=('lvm2')
-		if [[ $BTRFS_MNT ]] || grep -qi 'btrfs' <<< "$blk"; then
+		if [[ $BTRFS_MNT ]] || [[ $blk =~ btrfs ]]; then
 			inpkg+=('btrfs-progs')
 		fi
 	else
@@ -2052,7 +2037,7 @@ install_packages()
 	# check that packages were trying to install are available, slow as shit
 	# but I'm done doing this manually every time the arch repos change
 	for pkg in "${inpkg[@]}"; do
-		if pacman -Qq $pkg >/dev/null 2>&1 || pacman -Ssq "^$pkg$" >/dev/null 2>&1; then
+		if pacman -Ssq "^$pkg$" >/dev/null 2>&1; then
 			goodinpkg+=("$pkg")
 		else
 			echo "package missing or no longer available: $pkg -- ignoring"