diff options
| author | James Meyer <james.meyer@operamail.com> | 2011-10-19 18:31:38 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2011-10-19 18:31:38 (GMT) |
| commit | d9aad8b00a9f3fb60e456c0e528df90189acb5b3 (patch) | |
| tree | 6b9126d2336c62d1e5533798e7348f6a5723f6ba /abs/core/LinHES-config/xconfig.sh | |
| parent | d9a08ac22f9c6661cf3b478927be321274d10794 (diff) | |
| parent | c65b741914b31ac88086e363edc4415eb6aa1686 (diff) | |
| download | linhes_pkgbuild-d9aad8b00a9f3fb60e456c0e528df90189acb5b3.zip linhes_pkgbuild-d9aad8b00a9f3fb60e456c0e528df90189acb5b3.tar.gz linhes_pkgbuild-d9aad8b00a9f3fb60e456c0e528df90189acb5b3.tar.bz2 | |
Merge remote-tracking branch 'origin/testing' into testing
Conflicts:
abs/core/LinHES-config/PKGBUILD
Diffstat (limited to 'abs/core/LinHES-config/xconfig.sh')
| -rwxr-xr-x | abs/core/LinHES-config/xconfig.sh | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/abs/core/LinHES-config/xconfig.sh b/abs/core/LinHES-config/xconfig.sh index 11aedf5..c43c1e5 100755 --- a/abs/core/LinHES-config/xconfig.sh +++ b/abs/core/LinHES-config/xconfig.sh @@ -198,16 +198,14 @@ function setupAdvancedX { function nvidia_prepare { for i in libgl nvidia nvidia-utils nvidia-173xx nvidia-173xx-utils nvidia-96xx nvidia-96xx-utils do - echo "Removing $i" +# echo "Removing $i" pacman --noconfirm -Rdd $i > /dev/null 2>&1 done for i in `echo ${NVPKGS}` do - echo $i - pacman --noconfirm -Rc $i - # echo pacman -R $NVPKGS - #pacman -R $NVPKGS +# echo "Removing $i" + pacman --noconfirm -Rc $i > /dev/null 2>&1 done @@ -228,8 +226,6 @@ function nvidia_driver_install { then #install latest drivers echo "installing current nvidia drivers" - # pacman --noconfirm -Rd libgl > /dev/null 2>&1 - # pacman --noconfirm -R $NVPKGS > /dev/null 2>&1 nvidia_prepare pacman --noconfirm -S nvidia nvidia-utils > /dev/null 2>&1 fi @@ -241,8 +237,6 @@ function nvidia_driver_install { then #install 96xx drivers echo "installing nvidia 96xx drivers" -# # pacman --noconfirm -Rd libgl > /dev/null 2>&1 -# # pacman --noconfirm -R $NVPKGS > /dev/null 2>&1 nvidia_prepare pacman --noconfirm -S nvidia-96xx nvidia-96xx-utils > /dev/null 2>&1 fi @@ -252,8 +246,6 @@ function nvidia_driver_install { then #install latest drivers echo "installing 173 nvidia drivers" -# pacman --noconfirm -Rd libgl > /dev/null 2>&1 -# pacman --noconfirm -R $NVPKGS > /dev/null 2>&1 nvidia_prepare pacman --noconfirm -S nvidia-173xx nvidia-173xx-utils > /dev/null 2>&1 fi |