From 4f938e227ac669190de7632fb064d01a892ac3ad Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 4 Sep 2012 19:58:34 -0500
Subject: LinHES-system: mythfrontend-start: revert fork of startcmd
Forking startcmd causes MythWelcome to act on remote keypresses when mythfrontend-start quits.
linhes-scripts: pause-mythcommflag.sh: only look for 1 instance of mythfrontend. refs #847
---
abs/core/LinHES-system/PKGBUILD | 4 ++--
abs/core/LinHES-system/mythfrontend-start | 4 ++--
abs/core/linhes-scripts/PKGBUILD | 8 ++++----
abs/core/linhes-scripts/limit-mythcommflag.sh | 4 ++--
abs/core/linhes-scripts/pause-mythcommflag.sh | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index b5f6ab3..6b33779 100644
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=2
-pkgrel=57
+pkgrel=58
arch=('i686')
MVDIR=$startdir/pkg/usr/LH
BINDIR=$startdir/pkg/usr/bin
@@ -68,7 +68,7 @@ md5sums=('d1a5963c5a440a608031c6d750232633'
'dc3eef2a624754e16805d72bbe488b67'
'dc0be354ce77ba2b89868fc29b942c43'
'542e670e78d117657f93141e9689f54d'
- 'ec975dd053ca28c2b537b027611993fe'
+ '41951459ea9d2b0567be521b67e6285a'
'ba351b92e69bcaf26a9bf80417b09c3c'
'4545eb39213d40b5a2bdeda5e066cdc4'
'962a3e9eaba2d1466251b7ab0956705d'
diff --git a/abs/core/LinHES-system/mythfrontend-start b/abs/core/LinHES-system/mythfrontend-start
index 9aac881..5cfc9b7 100755
--- a/abs/core/LinHES-system/mythfrontend-start
+++ b/abs/core/LinHES-system/mythfrontend-start
@@ -22,8 +22,8 @@ then
mythvantage -Q "${question}"
if [ $? = 16 ]
then
- $STARTCMD 2>&1 &
+ $STARTCMD 2>&1
fi
else
- $STARTCMD 2>&1 &
+ $STARTCMD 2>&1
fi
diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD
index 0dfb4e7..4ffdc6f 100644
--- a/abs/core/linhes-scripts/PKGBUILD
+++ b/abs/core/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=linhes-scripts
pkgver=7
-pkgrel=47
+pkgrel=48
pkgdesc="Various scripts that help to make LinHES, LinHES."
arch=('i686' 'x86_64')
license=('GPL2')
@@ -59,7 +59,7 @@ build() {
cd ${srcdir}
install -d ${pkgdir}/usr/LH/bin
install -d ${pkgdir}/usr/LH/etc
- install -D -m755 myth2* *.sh *.pl *.py vdpau* run-* pause_* LinHES* ${pkgdir}/usr/LH/bin/
+ install -D -m755 myth2* *.sh *.pl *.py vdpau* run-* LinHES* ${pkgdir}/usr/LH/bin/
install -D -m755 upgrade_screen_rc ${pkgdir}/usr/LH/etc/
mkdir -p ${pkgdir}/etc/sv/pause-mythcommflag/supervise
cp run-pause-mythcommflag ${pkgdir}/etc/sv/pause-mythcommflag/run
@@ -77,13 +77,13 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5'
'f8df7665903ddf822f5148bc8a074e4a'
'18263972b6326e140bbef0bb7dfa2da9'
'410795ef9039e4c6c0484e706ecfd567'
- '0750d7c65109d12aa536f312a38410d1'
+ 'ad98d51e79f83df7c03f828dbeaea7f4'
'ac2a4a6b4100f4d7bfb9ecd9356c8c6e'
'd2b475821f902c5e081e7da43a35e6ac'
'95c092f67036a361ef7a57436f44332e'
'565ebca7b88bcd083322b7324f8e56e5'
'3b776bbff68906ddc2f62b7e0dde3fe4'
- '15f3143d2b1369da431e4268029aba40'
+ 'a57641fb63d7bb6d92a438f1ea779a57'
'3d0adf26280cde55a0c47188fff34826'
'25dd5b8ec0482d561b481bfce051d648'
'b2c3dd48a4abb976eda2d5fbf22a173a'
diff --git a/abs/core/linhes-scripts/limit-mythcommflag.sh b/abs/core/linhes-scripts/limit-mythcommflag.sh
index 5cd81bb..63a2872 100755
--- a/abs/core/linhes-scripts/limit-mythcommflag.sh
+++ b/abs/core/linhes-scripts/limit-mythcommflag.sh
@@ -48,8 +48,8 @@ cpulimit_pid=0
while true; do
PROCCOMMFLAG=`pidof mythcommflag`
if [ -n "${PROCCOMMFLAG}" ]; then
- BACKENDCPU=`top -bn1u mythtv | grep -m 1 mythbackend | awk '{ print $9 }'`
- FRONTENDCPU=`top -bn1u mythtv | grep -m 1 mythfrontend | awk '{ print $9 }'`
+ BACKENDCPU=`top -bn1u mythtv | grep -m 1 'mythbackend ' | awk '{ print $9 }'`
+ FRONTENDCPU=`top -bn1u mythtv | grep -m 1 'mythfrontend ' | awk '{ print $9 }'`
if [ "$FRONTENDCPU" = "" ]; then
FRONTENDCPU=0
fi
diff --git a/abs/core/linhes-scripts/pause-mythcommflag.sh b/abs/core/linhes-scripts/pause-mythcommflag.sh
index 4da808b..1db6db6 100755
--- a/abs/core/linhes-scripts/pause-mythcommflag.sh
+++ b/abs/core/linhes-scripts/pause-mythcommflag.sh
@@ -29,7 +29,7 @@ while true; do
PROCCOMMFLAG=`pidof mythcommflag`
if [ -n "${PROCCOMMFLAG}" ]
then
- FRONTENDCPU=`top -bn1u mythtv | grep mythfrontend | awk '{ print $9 }'`
+ FRONTENDCPU=`top -bn1u mythtv | grep -m 1 'mythfrontend ' | awk '{ print $9 }'`
if [ $COMMFLAGSTATE -eq 1 ]
then
CPUTHRESHOLD1=$CPUTHRESHOLD
--
cgit v0.12