LinHES-system: mythwelcome-config.py: idleTimeoutSecs should be set a global and check if setting doesn't exist

LinHES-session: don't run mythwelcome-config.py on every boot, just first.

3 files changed, 28 insertions, 28 deletions

diff --git a/abs/core/LinHES-system/LinHES-session b/abs/core/LinHES-system/LinHES-session
index 870428d..ae702cf 100755
--- a/abs/core/LinHES-system/LinHES-session
+++ b/abs/core/LinHES-system/LinHES-session
@@ -198,7 +198,6 @@ function first_mythwelcome_config(){
 
 
 function first_configure(){
-    first_mythwelcome_config
     if [ ! x$STARTUP_STYLE = xlegacy ]
     then
         first_configure_mv
@@ -209,6 +208,7 @@ function first_configure(){
 
 
 function first_configure_default(){
+    echo "First configure: legacy..."
     if [ !  $SystemType = "Frontend_only" ]
     then
         if [  -f ~/.configure ]
@@ -224,19 +224,18 @@ function first_configure_default(){
             else
                 rm -f ~/.no_meth
             fi
-
-        sudo sv stop mythbackend
-        xterm -fn *18* -e sudo taskset -c 0 /usr/bin/mythtv-setup
-        sudo sv start mythbackend
-        sudo chown -R mythtv.mythtv /home/mythtv
-        # only run mythfilldatabase for masterbackends
-        if [ $SystemType = "Master_backend" ]
-        then
-            nice -n 19 mythfilldatabase --quiet &
-            msg "Guide data is being loaded.\nUntil this completes\nsome shows will appear as "unknown"\nin the program guide."
-        fi
-
-        rm ~/.configure
+            first_mythwelcome_config
+            sudo sv stop mythbackend
+            xterm -fn *18* -e sudo taskset -c 0 /usr/bin/mythtv-setup
+            sudo sv start mythbackend
+            sudo chown -R mythtv.mythtv /home/mythtv
+            # only run mythfilldatabase for masterbackends
+            if [ $SystemType = "Master_backend" ]
+            then
+                nice -n 19 mythfilldatabase --quiet &
+                msg "Guide data is being loaded.\nUntil this completes\nsome shows will appear as unknown\nin the program guide."
+            fi
+            rm ~/.configure
         fi
     else
         if [  -f ~/.configure ]
@@ -248,6 +247,7 @@ function first_configure_default(){
 
 
 function first_configure_mv(){
+    echo "First configure..."
     if [ !  $SystemType = "Frontend_only" ]
     then
         if [  -f ~/.configure ]
@@ -259,9 +259,10 @@ function first_configure_mv(){
             #0 yes
             #1 yes/autodetech
             #2  no
+            first_mythwelcome_config
             while [ -e '/var/run/autocard.lock' ]
             do
-                msg "Waiting for capture card detection to complete"
+                msg "Waiting for capture card detection to complete..."
                 sleep 5
             done
             STATUS=$?
@@ -273,13 +274,13 @@ function first_configure_mv(){
                     /usr/bin/taskset -c 0 /usr/bin/mythtv-setup
                     /usr/MythVantage/bin/backend_control.sh start BE 127.0.0.1
             fi
-         # only run mythfilldatabase for masterbackends
-         if [ $SystemType = "Master_backend" ]
-         then
-            nice -n 19 mythfilldatabase --quiet &
-            msg "Guide data is being loaded.\nUntil this completes\nsome shows will appear as "unknown"\nin the program guide."
-         fi
-         rm -f ~/.configure
+            # only run mythfilldatabase for masterbackends
+            if [ $SystemType = "Master_backend" ]
+            then
+                nice -n 19 mythfilldatabase --quiet &
+                msg "Guide data is being loaded.\nUntil this completes\nsome shows will appear as unknown\nin the program guide."
+            fi
+            rm -f ~/.configure
         fi
     else
         if [  -f ~/.configure ]
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 9cf066a..cc3ec38 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-system
 pkgver=8.1
-pkgrel=21
+pkgrel=22
 arch=('i686' 'x86_64')
 install=system.install
 pkgdesc="Everything that makes LinHES an automated system"
@@ -75,7 +75,7 @@ package() {
 
 }
 
-md5sums=('2b69f7f632203f7196714b8855f962b1'
+md5sums=('a10cb96850951ae835c46f41f92463b2'
          'de32a1c50101265dd7f6ca5037f7a26a'
          '301884fb60521627fffd1160b2cf5181'
          '76b2637cac0452b3acdbeeb4e8a5474b'
@@ -126,7 +126,7 @@ md5sums=('2b69f7f632203f7196714b8855f962b1'
          '28f29578e5b3ba84fdf2aa57cf475bcf'
          '4a1fda884dcd7d65fb2690fbdbd92a83'
          '2b7fe3b57592823a4c7e3ec132dcb7f4'
-         '20dd97b614cab2454794416a3601c497'
+         '6e95aa86413abdb568ed157cf11dd69f'
          '95c092f67036a361ef7a57436f44332e'
          '410795ef9039e4c6c0484e706ecfd567'
          'eb879fee9603a05d5420d4ce8ed9e450'
diff --git a/abs/core/LinHES-system/mythwelcome-config.py b/abs/core/LinHES-system/mythwelcome-config.py
index 8cf78c2..01638a2 100755
--- a/abs/core/LinHES-system/mythwelcome-config.py
+++ b/abs/core/LinHES-system/mythwelcome-config.py
@@ -16,10 +16,9 @@ mythdb.settings[localhostname].MythShutdownPowerOff = u'sudo /sbin/poweroff'
 mythdb.settings[localhostname].MythShutdownXTermCmd = u'xterm'
 mythdb.settings[localhostname].MythWelcomeStartFECmd = u'/usr/LH/bin/mythfrontend-start'
 
-
 # mythtv-setup Shutdown/Wakeup options
-if mythdb.settings[localhostname].idleTimeoutSecs == u'0':
-    mythdb.settings[localhostname].idleTimeoutSecs = u'40'
+if mythdb.settings.NULL.idleTimeoutSecs == u'0' or mythdb.settings.NULL.idleTimeoutSecs == None:
+    mythdb.settings.NULL.idleTimeoutSecs = u'40'
 
 mythdb.settings.NULL.WakeupTimeFormat = u'yyyy-MM-ddThh:mm:ss'
 mythdb.settings.NULL.SetWakeuptimeCommand = u'/usr/bin/mythshutdown --setwakeup $time'