From 9a2e381a652230a2a78ec1f252b7460c4ba1ae3a Mon Sep 17 00:00:00 2001
From: James Meyer <jams@linhes.org>
Date: Fri, 10 Dec 2010 23:17:19 +0000
Subject: linhes-config: fix pkg installation typo. -removed zipcode -added
 some robustness to the whiteglass symlink for big cursor

---
 abs/core/LinHES-config/PKGBUILD        | 72 +++++++++++++++++++++++++++++++++-
 abs/core/LinHES-config/mv_software.py  |  1 +
 abs/core/LinHES-config/systemconfig.py |  6 ++-
 3 files changed, 76 insertions(+), 3 deletions(-)

diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 880f707..11e2b17 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=2.2
-pkgrel=11
+pkgrel=13
 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'
@@ -136,3 +136,73 @@ md5sums=('0f2d8f75fa96f9a1acbdca582560e889'
          'a7ed97cb1460978c823ff1d7c02b5c90'
          '2596460462cf6c889cf8f95485537b20'
          'a63ff9ef5250965aeabc74bfa8e43981')
+md5sums=('0f2d8f75fa96f9a1acbdca582560e889'
+         '1a4694fcd694b362c339bda781ed0f3e'
+         'e36da536dd651ef182e7642337889e77'
+         '985891a43f7c4c983eb2a362162f1a0f'
+         'd7a8cd4a0060399ae22e69f74e04eb07'
+         '7a45287a07145fde5aa664583d4f6fba'
+         'f88d2fb88339a4bf8ec9217a3fbcdef7'
+         '8ac1cfd2eca0f641737da0d0aca416a7'
+         '9ae8d79f620c6d19973c55c32a921874'
+         '4620f6f498ef4523398635cb0bd59425'
+         'bf32873c56d04c45ff0682f4e345e517'
+         'e459ed069317bccb20351f037a9df3d2'
+         '22c5e24bf87ad94ee2244d9016a0eea2'
+         '6aff504ed5e860adc1b7317cd0780900'
+         '55fccb1da0417a896b724f7cfc32dd5a'
+         'ab2aa42c2947148c2b1cac0ade6d1d55'
+         'd429b59d3cfb37b0624c6a4a71a7c2c0'
+         'a225143e3df6f56d451c2875e54ddbae'
+         '9151c74fcaf18ec4cf5e757cfdbc7017'
+         '3d1e4a119f38cff0498bf8a67e94e4b3'
+         '5b41cfc6f4ad5cdbcd28cf980110f135'
+         'ee7c8e1f025ce1527ecfffabafb26806'
+         '41b03fb1e0a9d9ae7588e3b813212772'
+         'a9ffe72c3ede99d505fdc97572a7c256'
+         'df43bce1712320508d4eef8449c5d223'
+         '65d93f15ac85adf8299552581789a731'
+         '4badc3c664c55f87396a473e6c14d4bc'
+         '36f5953944f98c50c0212a584996028e'
+         'fe5e31b833cc6707209e9d656b6eb53c'
+         '5c89f5c9c34b4f6e9b2e2c0e2d83f873'
+         '23d0e12b7ca1cc6ea6b993c1d7ff20b9'
+         '857a831e8627727306208f0e776b1b98'
+         '2f3de6bf907a04dcdcfe4f1418721b60'
+         '2596460462cf6c889cf8f95485537b20'
+         'a63ff9ef5250965aeabc74bfa8e43981')
+md5sums=('0f2d8f75fa96f9a1acbdca582560e889'
+         '1a4694fcd694b362c339bda781ed0f3e'
+         'e36da536dd651ef182e7642337889e77'
+         '985891a43f7c4c983eb2a362162f1a0f'
+         'd7a8cd4a0060399ae22e69f74e04eb07'
+         '7a45287a07145fde5aa664583d4f6fba'
+         'f88d2fb88339a4bf8ec9217a3fbcdef7'
+         '8ac1cfd2eca0f641737da0d0aca416a7'
+         '9ae8d79f620c6d19973c55c32a921874'
+         '4620f6f498ef4523398635cb0bd59425'
+         'bf32873c56d04c45ff0682f4e345e517'
+         'e459ed069317bccb20351f037a9df3d2'
+         '22c5e24bf87ad94ee2244d9016a0eea2'
+         '6aff504ed5e860adc1b7317cd0780900'
+         '55fccb1da0417a896b724f7cfc32dd5a'
+         'ab2aa42c2947148c2b1cac0ade6d1d55'
+         'd429b59d3cfb37b0624c6a4a71a7c2c0'
+         'a225143e3df6f56d451c2875e54ddbae'
+         '9151c74fcaf18ec4cf5e757cfdbc7017'
+         '3d1e4a119f38cff0498bf8a67e94e4b3'
+         '5b41cfc6f4ad5cdbcd28cf980110f135'
+         'ee7c8e1f025ce1527ecfffabafb26806'
+         '41b03fb1e0a9d9ae7588e3b813212772'
+         'a9ffe72c3ede99d505fdc97572a7c256'
+         'df43bce1712320508d4eef8449c5d223'
+         '65d93f15ac85adf8299552581789a731'
+         '4badc3c664c55f87396a473e6c14d4bc'
+         '36f5953944f98c50c0212a584996028e'
+         'fe5e31b833cc6707209e9d656b6eb53c'
+         'f0988a801216b44c96bf17e24a23e3a9'
+         '23d0e12b7ca1cc6ea6b993c1d7ff20b9'
+         '857a831e8627727306208f0e776b1b98'
+         '2f3de6bf907a04dcdcfe4f1418721b60'
+         '2596460462cf6c889cf8f95485537b20'
+         'a63ff9ef5250965aeabc74bfa8e43981')
diff --git a/abs/core/LinHES-config/mv_software.py b/abs/core/LinHES-config/mv_software.py
index 6a2201c..b278e28 100755
--- a/abs/core/LinHES-config/mv_software.py
+++ b/abs/core/LinHES-config/mv_software.py
@@ -42,6 +42,7 @@ def setup_software(systemconfig, data_config):
             logging.debug("  ERROR-- %s is not defined", pkg)
 
     for pkg in default_installed:
+        pkgname=pkg+postfix
         try:
             if systemconfig[pkg] == "0":
                 mv_common.pacremove(pkgname)
diff --git a/abs/core/LinHES-config/systemconfig.py b/abs/core/LinHES-config/systemconfig.py
index 0215181..c1d780d 100755
--- a/abs/core/LinHES-config/systemconfig.py
+++ b/abs/core/LinHES-config/systemconfig.py
@@ -40,7 +40,8 @@ def setup_x(systemconfig):
         logging.info("____Skipping of Xorg, config disabled____")
     else:
 	if not os.path.exists('/usr/share/icons/default'):
-		os.symlink('/usr/share/icons/whiteglass','/usr/share/icons/default');
+		if os.path.exists('/usr/share/icons/whiteglass'):
+ 	            os.symlink('/usr/share/icons/whiteglass','/usr/share/icons/default');
         if systemconfig["UseXLargeMouse"] == "1" :
             cmd = "echo Xcursor.size: 48 > %s/.Xdefaults" %data_config.MYTHHOME
         else:
@@ -151,7 +152,8 @@ def main(argv):
             logging.info("____Skipping of misc, config disabled____")
         else:
             import mv_misc
-            mv_misc.setup_zip(MVROOT,systemconfig["zipcode"])
+	    #zipcode is no longer used
+            #mv_misc.setup_zip(MVROOT,systemconfig["zipcode"])
             mv_misc.setup_tz(systemconfig["timezone"],systemconfig["TEMPLATES"])
             mv_misc.setup_nfs(systemconfig)
 
-- 
cgit v0.12

