From 39e72adf8761e503da51146ddc230efe80c2814e Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 25 Dec 2011 16:49:39 -0600
Subject: LinHES-session: changes for non-default startup style - fix multiple
 startup of mythfrontend - fixed the start stop of mythbackend via
 backend_control - added the startup of mythtv-setup

refs #805
---
 abs/core/LinHES-system/LinHES-session | 23 +++++++++++++++++------
 abs/core/LinHES-system/PKGBUILD       | 28 +++++++++++++++++++++-------
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/abs/core/LinHES-system/LinHES-session b/abs/core/LinHES-system/LinHES-session
index 626d346..e4833fa 100755
--- a/abs/core/LinHES-system/LinHES-session
+++ b/abs/core/LinHES-system/LinHES-session
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 . /etc/profile
 . /etc/systemconfig
 
@@ -218,6 +218,7 @@ function first_configure_mv(){
     then
         if [  -f ~/.configure ]
         then
+            msg "This is the first time starting MythTV.\nThe MythTV backend process will be stopped for setup."
             #for now skip these
             #autocard.py -g &
             #MythVantage -b
@@ -227,11 +228,14 @@ function first_configure_mv(){
             STATUS=$?
             if [ ! $STATUS = 2 ]
             then
-                    /usr/bin/backend_control.sh stop BE 127.0.0.1
-                    /usr/local/bin/mythtv-setup
-                    /usr/bin/backend_control.sh start BE 127.0.0.1
+                    /usr/MythVantage/bin/backend_control.sh stop BE 127.0.0.1
+                     msg "MythTV setup is starting.\nPlease follow the steps for adding tuners and guide data."
+                    /usr/bin/taskset -c 0 /usr/bin/mythtv-setup
+                    /usr/MythVantage/bin/backend_control.sh start BE 127.0.0.1
             fi
-         rm ~/.configure
+         nice -n 19 mythfilldatabase --quiet &
+         msg "Guide data is being loaded. \nUntil this completes \nsome shows will appear as "unknown" \nin the program guide."
+         rm -f ~/.configure
         fi
     fi
 
@@ -275,7 +279,14 @@ function run_myth(){
             else
                 killall -9 irexec
                 /usr/bin/irexec -d
-                $STARTCMD 2>&1 &
+
+                if [ x$STARTUP_STYLE = xmythvantage ]
+                then
+                    $STARTCMD 2>&1
+                else
+                    $STARTCMD 2>&1 &
+                fi
+
             fi
         fi
 }
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index d0012c1..d69d0e0 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-system
 pkgver=2
-pkgrel=13
+pkgrel=17
 arch=('i686')
 MVDIR=$startdir/pkg/usr/LH
 BINDIR=$startdir/pkg/usr/bin
@@ -8,9 +8,19 @@ install=LinHES.install
 pkgdesc="scripts and things related to having an  automated system"
 depends=(linhes-sounds xdotool fluxbox tilda keylaunch python_aosd)
 backup=(etc/modprobe.d/alsa-base)
-binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh LinHES-run firstboot.sh load-modules-mythvantage.sh unclutter-toggle.sh tvterm.sh myth_mtc.lr smolt.cron mythfrontend-start set_windowmanager.sh myth_status.py myth_status.sh xmsg.py install_supplemental_service.sh"
+binfiles="LinHES-start optimize_mythdb.py
+ myth_mtc.py myth_mtc.sh LinHES-run
+ firstboot.sh load-modules-mythvantage.sh
+ unclutter-toggle.sh tvterm.sh smolt.cron
+ mythfrontend-start set_windowmanager.sh
+ myth_status.py myth_status.sh
+ xmsg.py install_supplemental_service.sh
+ lh_system_backup_job
+ lh_system_restore_job
+ lh_system_host_update
+ lh_system_all_host_update"
 
-source=(LinHES-session LinHES-profile.sh $binfiles alsa-base)
+source=(LinHES-session LinHES-profile.sh $binfiles alsa-base myth_mtc.lr)
 
 build() {
         cd $startdir/src
@@ -37,18 +47,17 @@ build() {
         mkdir $startdir/pkg/etc/logrotate.d
         cp $startdir/myth_mtc.lr $startdir/pkg/etc/logrotate.d
 }
-md5sums=('989c22c2eae00501f5b46f215dbf5e59'
+md5sums=('71a1fc9b01476b0b2c30596107eeff75'
          '5881bdb43d578ec3a79d1f77ea58a3db'
          'a875ee97f86e46f34a741c2bc455f894'
          '76b2637cac0452b3acdbeeb4e8a5474b'
-         '6a42d3799fad2ebffac2fbf2411511ed'
+         'd1f27cb422010077c841376526fe46ea'
          '2ef9f945e034119f77d9b6beb17e4fa5'
          'f7ecc552a2823cae63d75f58dc7435c4'
          '18a884a73344ff6eb74f63b49745e0f5'
          'dc3eef2a624754e16805d72bbe488b67'
          'dc0be354ce77ba2b89868fc29b942c43'
          '542e670e78d117657f93141e9689f54d'
-         'f1870a9522c79e6b248fcbf81dec3280'
          'abe887472a170bd1a8e6da6a7b7e93e4'
          '752488eb8bfb672ce0e4c924f7faf3d1'
          'dae4dfb638b11c8c79fb1424a60b762a'
@@ -56,4 +65,9 @@ md5sums=('989c22c2eae00501f5b46f215dbf5e59'
          'ce72aad1fc66c575f863d4bfbf65ce16'
          'd03aedeeeda0f5e9c1eb437411c88477'
          '94ce8f1d5085c0db7b267db8c2e9a3ff'
-         'eb879fee9603a05d5420d4ce8ed9e450')
+         '894ce7ffcc581ce9db50b53aef7aa29e'
+         'e3641f091fc8e5c61e21428ec69fcce7'
+         '735500e617a621d27b31ccdeeefe2494'
+         '24c600f89f68ef04aefa74123c53b6e9'
+         'eb879fee9603a05d5420d4ce8ed9e450'
+         'f1870a9522c79e6b248fcbf81dec3280')
-- 
cgit v0.12

