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.

1 files changed, 23 insertions, 22 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 ]