summaryrefslogtreecommitdiffstats
path: root/abs/core/LinHES-config
diff options
context:
space:
mode:
Diffstat (limited to 'abs/core/LinHES-config')
-rw-r--r--abs/core/LinHES-config/PKGBUILD9
-rw-r--r--abs/core/LinHES-config/README5
-rwxr-xr-xabs/core/LinHES-config/xconfig.sh14
3 files changed, 14 insertions, 14 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index a4cec3b..b94878b 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=2.3
-pkgrel=22
+pkgrel=30
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'
@@ -110,7 +110,7 @@ md5sums=('6259677916192a92d1adf47b276f7829'
'c20f73d4da5d7e15e1f3eb85c7dcb49a'
'8ac1cfd2eca0f641737da0d0aca416a7'
'9ae8d79f620c6d19973c55c32a921874'
- 'ad2ba000decfc1e50533692f1793e620'
+ '287c91018794963a52510273f08d3de7'
'ecf9e5df20683a769c4a8a8f2d65de85'
'e459ed069317bccb20351f037a9df3d2'
'97de45a04f4efbd9d40d9fc0e1db1c3f'
@@ -121,8 +121,13 @@ md5sums=('6259677916192a92d1adf47b276f7829'
'a225143e3df6f56d451c2875e54ddbae'
'9151c74fcaf18ec4cf5e757cfdbc7017'
'3d1e4a119f38cff0498bf8a67e94e4b3'
+<<<<<<< HEAD
'fb80a58b1b4cfb26aee48bc991162b40'
'5f3259afe031fda189edae41dd1458f0'
+=======
+ 'd6c2d07c58ca6484c5be8b7093b921cd'
+ 'e6538618f7bb5fb6b79c132803451c39'
+>>>>>>> origin/testing
'41b03fb1e0a9d9ae7588e3b813212772'
'b845de3e05c1734cce4b9ac5e8f1baaf'
'56ca5fd7d6b8d1828c95d13eb0d34de5'
diff --git a/abs/core/LinHES-config/README b/abs/core/LinHES-config/README
index 65a89d2..915e72e 100644
--- a/abs/core/LinHES-config/README
+++ b/abs/core/LinHES-config/README
@@ -1,4 +1,7 @@
-Thanks for choosing LinHES! At the moment, LinHES is compiled for i686.
+Thanks for choosing LinHES!
+
+Detailed Installation Guide:
+http://linhes.org/bugs/projects/linhes/wiki/Install_LinHES
Support for LinHES can be obtained at:
http://linhes.org
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