summaryrefslogtreecommitdiffstats
path: root/abs/core
diff options
context:
space:
mode:
Diffstat (limited to 'abs/core')
-rwxr-xr-xabs/core/LinHES-system/LinHES-run3
-rwxr-xr-xabs/core/LinHES-system/LinHES-session6
-rw-r--r--abs/core/LinHES-system/PKGBUILD8
-rw-r--r--abs/core/LinHES-system/myth_status.py13
-rw-r--r--abs/core/mythinstall/PKGBUILD2
-rwxr-xr-xabs/core/mythinstall/checkout_MythVantage.sh4
-rwxr-xr-xabs/core/runit-scripts/PKGBUILD3
-rwxr-xr-xabs/core/runit-scripts/runitscripts/services/mythbackend/run2
8 files changed, 23 insertions, 18 deletions
diff --git a/abs/core/LinHES-system/LinHES-run b/abs/core/LinHES-system/LinHES-run
index 883bcda..0bb66ea 100755
--- a/abs/core/LinHES-system/LinHES-run
+++ b/abs/core/LinHES-system/LinHES-run
@@ -111,7 +111,8 @@ if [ x"$UseMythWelcome" = "x1" ]
then
STARTCMD="/usr/bin/mythwelcome"
else
- STARTCMD="/usr/bin/mythfrontend -d -l /var/log/mythtv/mythfrontend.log"
+ #STARTCMD="/usr/bin/mythfrontend -d -l /var/log/mythtv/mythfrontend.log"
+ STARTCMD="/usr/bin/mythfrontend -d --syslog local6"
fi
echo "====================================================================="
diff --git a/abs/core/LinHES-system/LinHES-session b/abs/core/LinHES-system/LinHES-session
index da2f14e..16705de 100755
--- a/abs/core/LinHES-system/LinHES-session
+++ b/abs/core/LinHES-system/LinHES-session
@@ -49,9 +49,9 @@ export MALLOC_CHECK_=0
function delay_osd(){
if [ x$STARTUP_STYLE = xmythvantage ]
then
- cmd="ps -ef | grep -v grep | grep xmsg.py"
+ cmd="ps -ef | grep -v grep | grep -q xmsg.py"
else
- cmd="ps -ef | grep -v grep | grep osd_cat"
+ cmd="ps -ef | grep -v grep | grep -q osd_cat"
fi
eval $cmd
@@ -276,7 +276,7 @@ function start_myth() {
then
STARTCMD="/usr/bin/mythwelcome"
else
- STARTCMD="/usr/bin/mythfrontend -d -l /var/log/mythtv/mythfrontend.log"
+ STARTCMD="/usr/bin/mythfrontend -d --syslog local6"
fi
echo "====================================================================="
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 94f592d..18d67e5 100644
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=2
-pkgrel=42
+pkgrel=44
arch=('i686')
MVDIR=$startdir/pkg/usr/LH
BINDIR=$startdir/pkg/usr/bin
@@ -52,20 +52,20 @@ build() {
mkdir $startdir/pkg/etc/logrotate.d
cp $startdir/myth_mtc.lr $startdir/pkg/etc/logrotate.d
}
-md5sums=('d6a564f3286590875874573107940908'
+md5sums=('e8a0e71dabadb5a860b4e113615c3071'
'5881bdb43d578ec3a79d1f77ea58a3db'
'a875ee97f86e46f34a741c2bc455f894'
'76b2637cac0452b3acdbeeb4e8a5474b'
'd1f27cb422010077c841376526fe46ea'
'2ef9f945e034119f77d9b6beb17e4fa5'
- '5c96527397a35519d72c78d6e3c8dbea'
+ 'c1c5f68835afbb2bad5d5e6cec0fc1dc'
'5e67a8b7ff57ec32d668bce7aab0aa6d'
'dc3eef2a624754e16805d72bbe488b67'
'dc0be354ce77ba2b89868fc29b942c43'
'542e670e78d117657f93141e9689f54d'
'752488eb8bfb672ce0e4c924f7faf3d1'
'ba351b92e69bcaf26a9bf80417b09c3c'
- 'b41b08ea923d94b90d22f92e291ad9ee'
+ '294e54209538018008323d164ce39fb3'
'962a3e9eaba2d1466251b7ab0956705d'
'd03aedeeeda0f5e9c1eb437411c88477'
'94ce8f1d5085c0db7b267db8c2e9a3ff'
diff --git a/abs/core/LinHES-system/myth_status.py b/abs/core/LinHES-system/myth_status.py
index 53d64d9..4637b90 100644
--- a/abs/core/LinHES-system/myth_status.py
+++ b/abs/core/LinHES-system/myth_status.py
@@ -90,12 +90,15 @@ print ""
print "Conflicted Recordings:"
print "----------------------"
a=be.getConflictedRecordings()
-if len(a) == 0:
+try:
+ if len(a) == 0:
+ print " No conflicts"
+ else:
+ for i in a:
+ title_chan="%s (%s)" %(i.title, i.channame)
+ print " %s - %-50s " %(i.starttime,title_chan)
+except:
print " No conflicts"
-else:
- for i in a:
- title_chan="%s (%s)" %(i.title, i.channame)
- print " %s - %-50s " %(i.starttime,title_chan)
print ""
print ""
diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index ce0ec36..d48b586 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jams
pkgname=mythinstall
pkgver=3
-pkgrel=17
+pkgrel=18
pkgdesc="LinHES installer/systemconfig GUI."
arch=i686
depends=()
diff --git a/abs/core/mythinstall/checkout_MythVantage.sh b/abs/core/mythinstall/checkout_MythVantage.sh
index a61ed95..ecc7cd0 100755
--- a/abs/core/mythinstall/checkout_MythVantage.sh
+++ b/abs/core/mythinstall/checkout_MythVantage.sh
@@ -2,8 +2,8 @@
MYDIR=`pwd`
PREFIX="\/usr\/include\/mythtv"
-LIBVERSION=0.24
-VERSION=0.24.0
+LIBVERSION=0.25
+VERSION=0.25.0
function setup_links {
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index 7e0a71c..30acc6a 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=runit-scripts
pkgver=2.1.1
-pkgrel=56
+pkgrel=57
pkgdesc="collection of startup scripts for runit"
url="http://smarden.org/runit/"
license="BSD"
@@ -26,5 +26,6 @@ build() {
install -m755 $startdir/src/fbsplash-runit.sh $startdir/pkg/etc/rc.d/functions.d/fbsplash-runit.sh
install -m0755 reboot-runit halt-runit logger $startdir/pkg/sbin
rsync -a --exclude=.svn services/* $startdir/pkg/etc/sv
+ chmod -R 755 $startdir/pkg/etc/sv
}
md5sums=('c79246677d5ffe687bcf6df1b9c2abc2')
diff --git a/abs/core/runit-scripts/runitscripts/services/mythbackend/run b/abs/core/runit-scripts/runitscripts/services/mythbackend/run
index e3ef721..9683dd7 100755
--- a/abs/core/runit-scripts/runitscripts/services/mythbackend/run
+++ b/abs/core/runit-scripts/runitscripts/services/mythbackend/run
@@ -39,5 +39,5 @@ fi
# sleep 10
#
# else
- exec su mythtv -c "/usr/bin/mythbackend --logfile /var/log/mythtv/mythbackend.log"
+ exec su mythtv -c "/usr/bin/mythbackend --logpath /var/log/mythtv/"
# fi