Merge branch 'master' of mihanson@knoppmyth.net:LinHES-PKGBUILD

4 files changed, 47 insertions, 28 deletions

diff --git a/abs/core-testing/LinHES-system/LinHES-run b/abs/core-testing/LinHES-system/LinHES-run
index 8f235e8..f6451f5 100644
--- a/abs/core-testing/LinHES-system/LinHES-run
+++ b/abs/core-testing/LinHES-system/LinHES-run
@@ -1,4 +1,9 @@
 #!/bin/sh
+function msg(){
+    echo -e "$1"  | osd_cat --font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*" --shadow=3 --pos=middle --align=centre --offset=200 --color=yellow --delay=5 &
+
+}
+
 . /etc/profile
 . /etc/systemconfig
 idle=1
@@ -8,7 +13,7 @@ jitter=200
 #/usr/bin/tilda &
 
 #move mouse to corner
-xdotool mousemove -10 -10
+xdotool mousemove 0 0 
 /usr/X11R6/bin/unclutter -root -idle $idle -jitter $jitter -noevents  &
 if [ x"$Screensavertype" = "xgscreensaver" ]
 then
@@ -64,13 +69,14 @@ then
 	fi
 	sudo pacman -R myth2ipod myt2xvid3
 	sudo pacman -S --noconfirm myth2ipod myt2xvid3
-        sudo sv stop mythbackend
+    sudo sv stop mythbackend
 	cat /data/database/dvd_transcode_r6.sql | mysql -u root mythconverg
-        xterm -fn *18* -e sudo taskset -c 0 /usr/bin/mythtv-setup
-        sudo sv start mythbackend
+    xterm -fn *18* -e sudo taskset -c 0 /usr/bin/mythtv-setup
+    sudo sv start mythbackend
 	sudo chown -R mythtv.mythtv /home/mythtv
-        nice -n 19 mythfilldatabase --quiet &
-        rm ~/.configure
+    nice -n 19 mythfilldatabase --quiet &
+    msg "Guide data is being loaded. \n Until this completes\n some shows will appear as unknown \n in the program guide."
+    rm ~/.configure
     fi
 fi
 
diff --git a/abs/core-testing/LinHES-system/PKGBUILD b/abs/core-testing/LinHES-system/PKGBUILD
index f775314..c76205a 100644
--- a/abs/core-testing/LinHES-system/PKGBUILD
+++ b/abs/core-testing/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-system
 pkgver=1.1
-pkgrel=11
+pkgrel=25
 arch=('i686')
 MVDIR=$startdir/pkg/usr/LH
 BINDIR=$startdir/pkg/usr/bin
@@ -8,7 +8,7 @@ install=LinHES.install
 pkgdesc="scripts and things related to having a automated system"
 depends=(linhes-sounds xdotool)
 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 myth_mtc.lr smolt.cron "
+binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh LinHES-run firstboot.sh load-modules-mythvantage.sh unclutter-toggle.sh myth_mtc.lr smolt.cron mythfrontend-start"
 
 source=(LinHES-session LinHES-profile.sh $binfiles alsa-base)
 
@@ -41,32 +41,18 @@ mkdir $startdir/pkg/etc/logrotate.d
 cp $startdir/myth_mtc.lr $startdir/pkg/etc/logrotate.d
 }
 
-
-md5sums=('19934a456d0e112298b8aac3279f9a16'
-         '5881bdb43d578ec3a79d1f77ea58a3db'
-         'a875ee97f86e46f34a741c2bc455f894'
-         'cdcbc530224215f8fcf7ebcd93d7eb0b'
-         'c60b6c66f498809a6e5ca18a8c97d336'
-         'ccae1296ef248fa52ec3a7cb820a476e'
-         '6112f32c48763a057341ccfb18d2375a'
-         '18a884a73344ff6eb74f63b49745e0f5'
-         'dc3eef2a624754e16805d72bbe488b67'
-         '72eb4117bb7d523691233c40e7535752'
-         'f1870a9522c79e6b248fcbf81dec3280'
-         '90a5d903e11e8bb457855d2ffd657e1e'
-         'eb879fee9603a05d5420d4ce8ed9e450')
 md5sums=('19934a456d0e112298b8aac3279f9a16'
          '5881bdb43d578ec3a79d1f77ea58a3db'
          'a875ee97f86e46f34a741c2bc455f894'
          'cdcbc530224215f8fcf7ebcd93d7eb0b'
          'c60b6c66f498809a6e5ca18a8c97d336'
          'ccae1296ef248fa52ec3a7cb820a476e'
-         '6112f32c48763a057341ccfb18d2375a'
+         '7bae998ba458a7f74c51c7268e39b28d'
          '18a884a73344ff6eb74f63b49745e0f5'
          'dc3eef2a624754e16805d72bbe488b67'
-         '72eb4117bb7d523691233c40e7535752'
+         'dc0be354ce77ba2b89868fc29b942c43'
          'f1870a9522c79e6b248fcbf81dec3280'
-         'f891f01eac77a1a9cd3d638c28ae4b3a'
+         'abe887472a170bd1a8e6da6a7b7e93e4'
          'eb879fee9603a05d5420d4ce8ed9e450')
 md5sums=('19934a456d0e112298b8aac3279f9a16'
          '5881bdb43d578ec3a79d1f77ea58a3db'
@@ -74,12 +60,13 @@ md5sums=('19934a456d0e112298b8aac3279f9a16'
          'cdcbc530224215f8fcf7ebcd93d7eb0b'
          'c60b6c66f498809a6e5ca18a8c97d336'
          'ccae1296ef248fa52ec3a7cb820a476e'
-         '6112f32c48763a057341ccfb18d2375a'
+         '7bae998ba458a7f74c51c7268e39b28d'
          '18a884a73344ff6eb74f63b49745e0f5'
          'dc3eef2a624754e16805d72bbe488b67'
-         '72eb4117bb7d523691233c40e7535752'
+         'dc0be354ce77ba2b89868fc29b942c43'
          'f1870a9522c79e6b248fcbf81dec3280'
          'abe887472a170bd1a8e6da6a7b7e93e4'
+         '5bced1c7b92e6190835139494c5e9905'
          'eb879fee9603a05d5420d4ce8ed9e450')
 md5sums=('19934a456d0e112298b8aac3279f9a16'
          '5881bdb43d578ec3a79d1f77ea58a3db'
@@ -87,10 +74,11 @@ md5sums=('19934a456d0e112298b8aac3279f9a16'
          'cdcbc530224215f8fcf7ebcd93d7eb0b'
          'c60b6c66f498809a6e5ca18a8c97d336'
          'ccae1296ef248fa52ec3a7cb820a476e'
-         '6022095f05d0428de926bb81b1693d56'
+         '7bae998ba458a7f74c51c7268e39b28d'
          '18a884a73344ff6eb74f63b49745e0f5'
          'dc3eef2a624754e16805d72bbe488b67'
          'dc0be354ce77ba2b89868fc29b942c43'
          'f1870a9522c79e6b248fcbf81dec3280'
          'abe887472a170bd1a8e6da6a7b7e93e4'
+         '752488eb8bfb672ce0e4c924f7faf3d1'
          'eb879fee9603a05d5420d4ce8ed9e450')
diff --git a/abs/core-testing/LinHES-system/bin/mythrestore b/abs/core-testing/LinHES-system/bin/mythrestore
index 7fce371..76b76a3 100755
--- a/abs/core-testing/LinHES-system/bin/mythrestore
+++ b/abs/core-testing/LinHES-system/bin/mythrestore
@@ -86,6 +86,9 @@ fi
 do_db_updates
 do_file_updates
 
+#post restore fixup for sshd
+/usr/MythVantage/bin/systemconfig.py -m user
+
 # Now it's more or less safe to restart the backend.
 start_mythbackend
 
diff --git a/abs/core-testing/LinHES-system/mythfrontend-start b/abs/core-testing/LinHES-system/mythfrontend-start
new file mode 100755
index 0000000..c92d024
--- /dev/null
+++ b/abs/core-testing/LinHES-system/mythfrontend-start
@@ -0,0 +1,22 @@
+#!/bin/bash
+PIDS=$(pidof mythfrontend)
+P_array=( $PIDS )
+let "instances = ${#P_array[*]}"  # Count elements.
+
+if [ $instances -gt 0 ];
+then
+    if [ $instances -eq 1 ]; then
+        diagtext="is already a MythFrontend"
+    else
+        diagtext="are already $instances MythFrontends"
+    fi
+
+    question="There $diagtext running. Do you really want to start another one?"  
+    mythvantage -q "${question}"
+    if [ $?  = 16 ] 
+    then
+        mythfrontend --logfile /var/log/mythtv/mythfrontend.log
+    fi
+else
+    mythfrontend --logfile /var/log/mythtv/mythfrontend.log
+fi