summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2012-09-27 05:07:55 (GMT)
committerJames Meyer <james.meyer@operamail.com>2012-09-27 05:07:55 (GMT)
commitaeb0197b0731ae769b1aae8394eb6fc650757cdf (patch)
tree6d84eec8c5c7c449d38b7fa4e884505dcf6b35f9
parent8d7a3e620c1d1c363faf75e5d4055a2f9f0d3131 (diff)
downloadlinhes_pkgbuild-aeb0197b0731ae769b1aae8394eb6fc650757cdf.zip
linhes_pkgbuild-aeb0197b0731ae769b1aae8394eb6fc650757cdf.tar.gz
linhes_pkgbuild-aeb0197b0731ae769b1aae8394eb6fc650757cdf.tar.bz2
LinHES-system: adjust for the new msg_client syntax
remove lh_message and msg_osd.py
-rwxr-xr-xabs/core/LinHES-system/LinHES-session7
-rwxr-xr-xabs/core/LinHES-system/PKGBUILD20
-rwxr-xr-xabs/core/LinHES-system/diskspace.sh2
-rw-r--r--abs/core/LinHES-system/lh_backend_control.sh6
4 files changed, 18 insertions, 17 deletions
diff --git a/abs/core/LinHES-system/LinHES-session b/abs/core/LinHES-system/LinHES-session
index 902962f..d7c0151 100755
--- a/abs/core/LinHES-system/LinHES-session
+++ b/abs/core/LinHES-system/LinHES-session
@@ -13,6 +13,9 @@ xset -dpms s off
export MALLOC_CHECK_=0
+MYTH_ARGS="-d --syslog local6"
+[ -f /etc/conf.d/mythfrontend ] && . /etc/conf.d/mythfrontend
+
# # Run any scripting that applies to special hardware. These brand-specific commands that run
@@ -76,7 +79,7 @@ export MALLOC_CHECK_=0
function msg(){
#/usr/LH/bin/lh_message.sh "$1"
- /usr/LH/bin/msg_client.py "$1"
+ /usr/LH/bin/msg_client.py --msg "$1"
}
@@ -285,7 +288,7 @@ function start_myth() {
then
STARTCMD="/usr/bin/mythfrontend -d -l /var/log/mythtv/mythfrontend.log"
else
- STARTCMD="/usr/bin/mythfrontend -d --syslog local6"
+ STARTCMD="/usr/bin/mythfrontend $MYTH_ARGS"
fi
fi
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 2999796..9e57a5b 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=2
-pkgrel=98
+pkgrel=104
arch=('i686' 'x86_64')
MVDIR=$startdir/pkg/usr/LH
BINDIR=$startdir/pkg/usr/bin
@@ -14,14 +14,14 @@ binfiles="LinHES-start optimize_mythdb.py
unclutter-toggle.sh tvterm.sh
mythfrontend-start set_windowmanager.sh
myth_status.py myth_status.sh
- msg_osd.py install_supplemental_service.sh
+ install_supplemental_service.sh
lh_system_backup_job
lh_system_restore_job
lh_system_host_update
lh_system_all_host_update
add_storage.py
diskspace.sh
- cacheclean lh_message.sh lh_backend_control.sh switch_web.sh
+ cacheclean lh_backend_control.sh switch_web.sh
create_media_dirs.sh
msg_client.py msg_daemon.py gen_is_xml.py gen_lib_xml.py
misc_recent_recordings.pl
@@ -63,7 +63,7 @@ build() {
mkdir $startdir/pkg/etc/logrotate.d
cp $startdir/myth_mtc.lr $startdir/pkg/etc/logrotate.d
}
-md5sums=('a941af97fe534731a507b1d57c0c2aed'
+md5sums=('5bd4938cf41b63787aa4cdfd76423e09'
'5881bdb43d578ec3a79d1f77ea58a3db'
'a875ee97f86e46f34a741c2bc455f894'
'76b2637cac0452b3acdbeeb4e8a5474b'
@@ -75,23 +75,21 @@ md5sums=('a941af97fe534731a507b1d57c0c2aed'
'542e670e78d117657f93141e9689f54d'
'41951459ea9d2b0567be521b67e6285a'
'ee6b9d277843e7047f46bdd83e1377ec'
- '4545eb39213d40b5a2bdeda5e066cdc4'
+ '309638acf596ce3c790aa2bf5c7c9880'
'962a3e9eaba2d1466251b7ab0956705d'
- 'd03aedeeeda0f5e9c1eb437411c88477'
'1758aed160de64abfafb28a3a8f3390e'
'6a56efa9abcf914ebe380178749cf7ce'
'ceec78815ed01af733cdbca14cb0942b'
'859a80ddb4c234506379c605114c1343'
'47e093e8cfe4b5b96602358e1f540832'
'9f08fb2e821297841f1849c6221b87cb'
- 'b8f0414427c5d9afdc32ceb3ae56f82a'
+ 'b9b0a8370f46f0b5e144a66897e8eefb'
'6519d209e151cdc39ae7e1091d189c3e'
- 'd1cdf28fcb1c88f0e504905771dd6040'
- '88c669b8eeb988106bd26c9cf8277df2'
+ '8f474e019d5fcb775497aca355d61b0b'
'4a3cd8f9b33b2b86fdba47a8f1fa2859'
'4d5a2441fe681c85986c5626c2944a3d'
- 'a182af47a7d373b2a63a27e1bb7485b2'
- '5148fe4c6ac27fff8152c819c4d2b47a'
+ 'e4e6bd9ef85ab1498e5d3fb0d57816d2'
+ '1c8df75728926f0af53c8757c22d8c58'
'ea315f41dcd6c978e546c95fc05546cf'
'ac61cc460d9e97ba1f5ef69e92cdfbe5'
'06a628469051237943b7c874f2e29b8a'
diff --git a/abs/core/LinHES-system/diskspace.sh b/abs/core/LinHES-system/diskspace.sh
index 4064df2..635a972 100755
--- a/abs/core/LinHES-system/diskspace.sh
+++ b/abs/core/LinHES-system/diskspace.sh
@@ -17,7 +17,7 @@ CUT='/usr/bin/cut'
HOSTNAME='/usr/bin/hostname'
DATE='/bin/date'
OSD_CAT='/usr/bin/osd_cat'
-MSG_CLIENT='/usr/LH/bin/msg_client.py'
+MSG_CLIENT='/usr/LH/bin/msg_client.py --msg'
export DISPLAY=:0.0
#
# Static System Variables
diff --git a/abs/core/LinHES-system/lh_backend_control.sh b/abs/core/LinHES-system/lh_backend_control.sh
index b15ca35..c116cdb 100644
--- a/abs/core/LinHES-system/lh_backend_control.sh
+++ b/abs/core/LinHES-system/lh_backend_control.sh
@@ -24,7 +24,7 @@ case $1 in
then
$MV_BEC stop $dbhost
else
- msg_client.py "Stopping backend"
+ msg_client.py --msg "Stopping backend"
sudo sv stop mythbackend
fi
else
@@ -41,7 +41,7 @@ case $1 in
then
$MV_BEC start $dbhost
else
- msg_client.py "Starting backend"
+ msg_client.py --msg "Starting backend"
sudo sv start mythbackend
fi
else
@@ -58,7 +58,7 @@ case $1 in
then
$MV_BEC restart $dbhost
else
- msg_client.py "Restarting backend"
+ msg_client.py --msg "Restarting backend"
sudo sv restart mythbackend
fi
else