diff options
| author | Britney Fransen <brfransen@gmail.com> | 2012-05-01 21:41:19 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2012-05-01 21:41:19 (GMT) |
| commit | 327e251b49fb25c48ddddae3536f5ce4a8b710ce (patch) | |
| tree | 8f5d7346ec0cbc999a7cf014a9d0533a47a8b829 | |
| parent | 622c2b05e6dc5f7a3d63cfe6bd51daae0e377b82 (diff) | |
| download | linhes_pkgbuild-327e251b49fb25c48ddddae3536f5ce4a8b710ce.zip linhes_pkgbuild-327e251b49fb25c48ddddae3536f5ce4a8b710ce.tar.gz linhes_pkgbuild-327e251b49fb25c48ddddae3536f5ce4a8b710ce.tar.bz2 | |
LinHES-system: LinHES-run & mythfrontend-start: check installed mythtv version and set startcmd.
| -rwxr-xr-x | abs/core/LinHES-system/LinHES-run | 8 | ||||
| -rw-r--r-- | abs/core/LinHES-system/PKGBUILD | 6 | ||||
| -rwxr-xr-x | abs/core/LinHES-system/mythfrontend-start | 11 |
3 files changed, 18 insertions, 7 deletions
diff --git a/abs/core/LinHES-system/LinHES-run b/abs/core/LinHES-system/LinHES-run index 0bb66ea..64fb2bc 100755 --- a/abs/core/LinHES-system/LinHES-run +++ b/abs/core/LinHES-system/LinHES-run @@ -111,8 +111,12 @@ 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 --syslog local6" + if pacman -Q mythtv | grep -q 0.24 + then + STARTCMD="/usr/bin/mythfrontend -d -l /var/log/mythtv/mythfrontend.log" + else + STARTCMD="/usr/bin/mythfrontend -d --syslog local6" + fi fi echo "=====================================================================" diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index 91807c1..d91a10f 100644 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=2 -pkgrel=45 +pkgrel=46 arch=('i686') MVDIR=$startdir/pkg/usr/LH BINDIR=$startdir/pkg/usr/bin @@ -58,12 +58,12 @@ md5sums=('e8a0e71dabadb5a860b4e113615c3071' '76b2637cac0452b3acdbeeb4e8a5474b' 'd1f27cb422010077c841376526fe46ea' '2ef9f945e034119f77d9b6beb17e4fa5' - 'c1c5f68835afbb2bad5d5e6cec0fc1dc' + 'c2c7b3d2d885fb4bdc393a69efba6f01' 'cbe4cba14fa9d01a62e2196edc1bd98b' 'dc3eef2a624754e16805d72bbe488b67' 'dc0be354ce77ba2b89868fc29b942c43' '542e670e78d117657f93141e9689f54d' - '35011127753a2d8f6e212353da719557' + '48b763dba127aac6ab05c84643f83b71' 'ba351b92e69bcaf26a9bf80417b09c3c' '294e54209538018008323d164ce39fb3' '962a3e9eaba2d1466251b7ab0956705d' diff --git a/abs/core/LinHES-system/mythfrontend-start b/abs/core/LinHES-system/mythfrontend-start index e2645bf..1f48449 100755 --- a/abs/core/LinHES-system/mythfrontend-start +++ b/abs/core/LinHES-system/mythfrontend-start @@ -3,6 +3,13 @@ PIDS=$(pidof mythfrontend) P_array=( $PIDS ) let "instances = ${#P_array[*]}" # Count elements. +if pacman -Q mythtv | grep -q 0.24 +then + STARTCMD="/usr/bin/mythfrontend -d -l /var/log/mythtv/mythfrontend.log" +else + STARTCMD="/usr/bin/mythfrontend -d --syslog local6" +fi + if [ $instances -gt 0 ]; then if [ $instances -eq 1 ]; then @@ -15,8 +22,8 @@ then mythvantage -q "${question}" if [ $? = 16 ] then - mythfrontend -d --syslog local6 + $STARTCMD 2>&1 fi else - mythfrontend -d --syslog local6 + $STARTCMD 2>&1 fi |