LinHES-config/system: check for config.xml and if it's not found run mythvantage.py -m hostype to create a new one.

3 files changed, 30 insertions, 24 deletions

diff --git a/abs/core/LinHES-config/LinHES.install b/abs/core/LinHES-config/LinHES.install
index 2b2d53c..fb967aa 100644
--- a/abs/core/LinHES-config/LinHES.install
+++ b/abs/core/LinHES-config/LinHES.install
@@ -18,23 +18,23 @@ post_install() {
 
 LINE="mythtv    ALL = NOPASSWD:/usr/MythVantage/bin/mythvantage"
 LINE1="mythtv   ALL = NOPASSWD:/usr/MythVantage/bin/MythVantage"
-for i in "$LINE"  "$LINE1"
-do
+    for i in "$LINE"  "$LINE1"
+    do
         cp /etc/sudoers /etc/sudoers.bak
         grep -q "$i" /etc/sudoers
         if [ $? != 0 ]
         then
-                echo  "$i" >> /etc/sudoers
-                visudo -cf /etc/sudoers
-                if [ ! $? = 0 ]
-                then
-                        cp /etc/sudoers.bak /etc/sudoers
-			echo $i
-                        echo "Error adding files"
-                        exit 1
-                fi
+            echo  "$i" >> /etc/sudoers
+            visudo -cf /etc/sudoers
+            if [ ! $? = 0 ]
+            then
+                cp /etc/sudoers.bak /etc/sudoers
+                echo $i
+                echo "Error adding files"
+                exit 1
+            fi
         fi
-done
+    done
 
 
 }
@@ -48,20 +48,26 @@ pre_upgrade() {
 # arg 1:  the new package version
 # arg 2:  the old package version
 post_upgrade() {
-	. /etc/profile
-	ps -ef|grep mysqld|grep -v grep
-	status=$?
-	echo "status $status"
-	if [ $status  = 0 ]
-	then
- 		restore_default_settings.sh -c load
-	fi
+    . /etc/profile
+    ps -ef|grep mysqld|grep -v grep
+    status=$?
+    echo "status $status"
+    if [ $status  = 0 ]
+    then
+        restore_default_settings.sh -c load
+    fi
         if [ ! -f /etc/blacklist.package ]
         then
             echo "List of packages to ignore" > /etc/blacklist.package
             echo  "one package per line" >> /etc/blacklist.package
         fi
-	cat /etc/LinHES-release > /etc/os_myth_release
+    cat /etc/LinHES-release > /etc/os_myth_release
+
+    if [ ! -f /usr/share/mythtv/config.xml ]
+    then
+       echo "config.xml not found, generating a new one"
+       /usr/MythVantage/bin/systemconfig.py -m hostype
+    fi
 }
 
 # arg 1:  the old package version
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 1c302b2..f9ede11 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=2.3
-pkgrel=58
+pkgrel=59
 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'
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 7bb5c16..80a449f 100644
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,12 +1,12 @@
 pkgname=LinHES-system
 pkgver=2
-pkgrel=33
+pkgrel=34
 arch=('i686')
 MVDIR=$startdir/pkg/usr/LH
 BINDIR=$startdir/pkg/usr/bin
 install=LinHES.install
 pkgdesc="scripts and things related to having an  automated system"
-depends=(linhes-sounds xdotool fluxbox tilda keylaunch python_aosd 'linhes-scripts>=7-24' 'runit-scripts>=2.1.1-43' 'udisks')
+depends=(linhes-sounds xdotool fluxbox tilda keylaunch python_aosd 'linhes-scripts>=7-24' 'runit-scripts>=2.1.1-43' 'udisks' 'LinHES-config>=2.3-59')
 backup=(etc/modprobe.d/alsa-base)
 binfiles="LinHES-start optimize_mythdb.py
  myth_mtc.py myth_mtc.sh LinHES-run