diff options
Diffstat (limited to 'abs')
| -rwxr-xr-x | abs/core/LinHES-config/PKGBUILD | 4 | ||||
| -rwxr-xr-x | abs/core/LinHES-config/xconfig.sh | 62 |
2 files changed, 42 insertions, 24 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index f8ab4e1..28fa7e3 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=8.6.0 -pkgrel=1 +pkgrel=2 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' @@ -156,7 +156,7 @@ md5sums=('49952a2375b8ee53d8673473f22f8d12' '27e4fcacca9b9662dd782fbdc92fceea' '2a7f3b34e522acfd08283b86c8926aba' 'da60447a2a5fe0e6f5aaed2e677281ef' - 'd94deab4efc68ed179a4f59f1a589e74' + '29558e4560a305239ae126880b3af810' 'f0376c98a7986897406d393186c0365e' '157e73d0f90d7b306aba8f5921aeedd3' '1f58c0393a131f4a8f9a84b3fe08a7e4' diff --git a/abs/core/LinHES-config/xconfig.sh b/abs/core/LinHES-config/xconfig.sh index b1e0c18..f730f95 100755 --- a/abs/core/LinHES-config/xconfig.sh +++ b/abs/core/LinHES-config/xconfig.sh @@ -19,10 +19,10 @@ echo -e `date`"\n" >> $LOGFILE 2>&1 ATI_PKGS="xf86-video-ati libglvnd libxnvctrl" INTEL_PKGS="xf86-video-intel libglvnd libxnvctrl" NVIDIA_PKGS="nvidia nvidia-utils opencl-nvidia nvidia-settings libglvnd libxnvctrl" -NVIDIA-390xx_PKGS="nvidia-390xx nvidia-390xx-utils opencl-nvidia-390xx nvidia-390xx-settings libglvnd libxnvctrl-390xx" -NVIDIA-340xx_PKGS="nvidia-340xx nvidia-340xx-utils opencl-nvidia-340xx nvidia-340xx-settings libglvnd libxnvctrl-340xx" -NVIDIA-304xx_PKGS="nvidia-304xx nvidia-304xx-utils opencl-nvidia-304xx libglvnd libxnvctrl-340xx" -NVIDIA_ALL_PKGS=`echo $NVIDIA_PKGS $NVIDIA-390xx_PKGS $NVIDIA-340xx_PKGS $NVIDIA-304xx_PKGS|xargs -n1|sort -u` +NVIDIA_390xx_PKGS="nvidia-390xx nvidia-390xx-utils opencl-nvidia-390xx nvidia-390xx-settings libglvnd libxnvctrl-390xx" +NVIDIA_340xx_PKGS="nvidia-340xx nvidia-340xx-utils opencl-nvidia-340xx nvidia-340xx-settings libglvnd libxnvctrl-340xx" +NVIDIA_304xx_PKGS="nvidia-304xx nvidia-304xx-utils opencl-nvidia-304xx libglvnd libxnvctrl-340xx" +NVIDIA_ALL_PKGS=`echo $NVIDIA_PKGS $NVIDIA_390xx_PKGS $NVIDIA_340xx_PKGS $NVIDIA_304xx_PKGS|xargs -n1|sort -u` VESA_PKGS="xf86-video-vesa libglvnd libxnvctrl" VMWARE_PKGS="xf86-input-vmmouse xf86-video-vmware xf86-video-vesa svga-dri libglvnd libxnvctrl" @@ -91,7 +91,8 @@ function presetupX { function nvidia_prepare { [[ -f "$NVIDIA_MSI_MODPROBE" ]] && rm -f "$NVIDIA_MSI_MODPROBE" - for i in ${$NVIDIA_ALL_PKGS} + echo "Remove all nvidia pkgs" >> $LOGFILE 2>&1 + for i in ${NVIDIA_ALL_PKGS} do pacman --noconfirm -Rdd $i >> $LOGFILE 2>&1 done @@ -133,6 +134,7 @@ function nvidia_driver_install { then echo "ERROR: Unable to install current nvidia driver" | tee -a $LOGFILE else + echo " Successfully Installed" | tee -a $LOGFILE INSTALLED=1 fi fi @@ -154,6 +156,7 @@ function nvidia_driver_install { then echo "ERROR: Unable to install nvidia-390xx driver" | tee -a $LOGFILE else + echo " Successfully Installed" | tee -a $LOGFILE INSTALLED=1 fi fi @@ -176,6 +179,7 @@ function nvidia_driver_install { then echo "ERROR: Unable to install nvidia-340xx driver" | tee -a $LOGFILE else + echo " Successfully Installed" | tee -a $LOGFILE INSTALLED=1 fi fi @@ -198,6 +202,7 @@ function nvidia_driver_install { then echo "ERROR: Unable to install nvidia-304xx driver" | tee -a $LOGFILE else + echo " Successfully Installed" | tee -a $LOGFILE INSTALLED=1 fi fi @@ -206,7 +211,7 @@ function nvidia_driver_install { if [ $INSTALLED -eq 0 ] then #this is a failsafe, can't find the right driver, then use the latest' - echo " Couldn't find the card id in any list" | tee -a $LOGFILE + echo "Couldn't find the card ID. Installing current nvidia driver" | tee -a $LOGFILE for i in ${NVIDIA_PKGS} do pkg_check $i @@ -218,6 +223,7 @@ function nvidia_driver_install { then echo "ERROR: Unable to install current nvidia driver" | tee -a $LOGFILE else + echo " Successfully Installed" | tee -a $LOGFILE INSTALLED=1 fi fi @@ -241,10 +247,13 @@ function vmware_driver_install { echo "Installing VMware driver" | tee -a $LOGFILE #this is used to remove nvidia nvidia_prepare - for i in ${VMWARE_PKGS} - do - pacman -S --noconfirm $i >> $LOGFILE 2>&1 - done + pacman --noconfirm -S ${VMWARE_PKGS} >> $LOGFILE 2>&1 + if [[ $? != 0 ]] + then + echo "ERROR: Unable to install VMware driver" | tee -a $LOGFILE + else + echo " Successfully Installed" | tee -a $LOGFILE + fi } function vesa_driver_install { @@ -255,10 +264,13 @@ function vesa_driver_install { echo "Installing Vesa driver" | tee -a $LOGFILE #this is used to remove nvidia nvidia_prepare - for i in ${VESA_PKGS} - do - pacman -S --noconfirm $i >> $LOGFILE 2>&1 - done + pacman --noconfirm -S ${VESA_PKGS} >> $LOGFILE 2>&1 + if [[ $? != 0 ]] + then + echo "ERROR: Unable to install vesa driver" | tee -a $LOGFILE + else + echo " Successfully Installed" | tee -a $LOGFILE + fi } function intel_driver_install { @@ -269,10 +281,13 @@ function intel_driver_install { echo "Installing Intel driver" | tee -a $LOGFILE #this is used to remove nvidia nvidia_prepare - for i in ${INTEL_PKGS} - do - pacman -S --noconfirm $i >> $LOGFILE 2>&1 - done + pacman --noconfirm -S ${INTEL_PKGS} >> $LOGFILE 2>&1 + if [[ $? != 0 ]] + then + echo "ERROR: Unable to install Intel driver" | tee -a $LOGFILE + else + echo " Successfully Installed" | tee -a $LOGFILE + fi } function ati_driver_install { @@ -283,10 +298,13 @@ function ati_driver_install { echo "Installing ATI driver" | tee -a $LOGFILE #this is used to remove nvidia nvidia_prepare - for i in ${ATI_PKGS} - do - pacman -S --noconfirm $i >> $LOGFILE 2>&1 - done + pacman --noconfirm -S ${ATI_PKGS} >> $LOGFILE 2>&1 + if [[ $? != 0 ]] + then + echo "ERROR: Unable to install ATI driver" | tee -a $LOGFILE + else + echo " Successfully Installed" | tee -a $LOGFILE + fi } function set_res { |