From 56c4d037e2ab62511767fb7086a1b93a13f02a46 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 18 May 2016 18:43:32 +0000
Subject: LinHES-config: xconfig.sh: add nvidia-settings

---
 abs/core/LinHES-config/PKGBUILD   | 4 ++--
 abs/core/LinHES-config/xconfig.sh | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 8af08e7..80633a6 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=8.4
-pkgrel=9
+pkgrel=10
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
 pkgdesc="Install and configure your system"
 depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -148,7 +148,7 @@ md5sums=('97b810ddc35d1f441dbe8cdd6886e2af'
          '27e4fcacca9b9662dd782fbdc92fceea'
          '2a7f3b34e522acfd08283b86c8926aba'
          'b596d2e3779a434435bc0f0277b1ba3e'
-         '9ecf4cb455aee12372832b1e7700988c'
+         'a751a88268029989f0067e2c9e75bf6e'
          'f0376c98a7986897406d393186c0365e'
          '157e73d0f90d7b306aba8f5921aeedd3'
          '1f58c0393a131f4a8f9a84b3fe08a7e4'
diff --git a/abs/core/LinHES-config/xconfig.sh b/abs/core/LinHES-config/xconfig.sh
index a5ad9c2..b5693b9 100755
--- a/abs/core/LinHES-config/xconfig.sh
+++ b/abs/core/LinHES-config/xconfig.sh
@@ -65,7 +65,7 @@ function presetupX {
 }
 
 function nvidia_prepare {
-    for i in libva-intel-driver mesa-libgl nvidia nvidia-utils nvidia-libgl opencl-nvidia libglvnd nvidia-304xx nvidia-304xx-utils nvidia-304xx-libgl opencl-nvidia-304xx nvidia-340xx nvidia-340xx-utils nvidia-340xx-libgl opencl-nvidia-340xx
+    for i in libva-intel-driver mesa-libgl nvidia nvidia-utils nvidia-libgl opencl-nvidia nvidia-settings libglvnd nvidia-304xx nvidia-304xx-utils nvidia-304xx-libgl opencl-nvidia-304xx nvidia-340xx nvidia-340xx-utils nvidia-340xx-libgl opencl-nvidia-340xx
     do
         pacman --noconfirm -Rdd $i >> $LOGFILE 2>&1
     done
@@ -96,7 +96,7 @@ function nvidia_driver_install {
     grep -qi "$CARDID" "$NVIDIA_SUPPORTED"
     if [[ $? = 0 || $VGAFORCED -eq 1 && $VGACARDTYPE == "nvidia" ]]
     then
-        LIST="nvidia nvidia-libgl nvidia-utils opencl-nvidia"
+        LIST="nvidia nvidia-libgl nvidia-utils opencl-nvidia nvidia-settings"
         for i in `echo ${LIST}`
         do
             pkg_check $i
@@ -167,7 +167,7 @@ function nvidia_driver_install {
         #this is a failsafe, can't find the right driver, then use the latest'
         echo "  Couldn't find the card id in any list"
         echo "  Couldn't find the card id in any list" >> $LOGFILE 2>&1
-        LIST="nvidia nvidia-libgl nvidia-utils opencl-nvidia"
+        LIST="nvidia nvidia-libgl nvidia-utils opencl-nvidia nvidia-settings"
         for i in `echo ${LIST}`
         do
             pkg_check $i
@@ -323,7 +323,7 @@ function pacman_wait {
         echo "  Waiting for pacman to quit..."
         while [ -f /var/lib/pacman/db.lck ]
         do
-	    sleep 5
+            sleep 5
         done
     fi
 }
-- 
cgit v0.12