From a16dcfb2770f199c9c62387ed5dd2592602cf9b3 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Fri, 1 Feb 2013 15:10:29 -0600 Subject: LinHES-config, mythinstall: change case of hd_pvr and serial to all lower refs #902 --- abs/core/LinHES-config/PKGBUILD | 4 ++-- abs/core/LinHES-config/mv_ir.py | 13 ++++++++++--- abs/core/mythinstall/PKGBUILD | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index e1e78cb..cf8ad7f 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.3 -pkgrel=216 +pkgrel=220 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config ) pkgdesc="Install and configure your system" depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted' @@ -159,7 +159,7 @@ md5sums=('32fc2b52809231d75a72492b91eeed74' 'c0549457750c4f8e8038d904a0f3012a' '3d1e3c7315881a109fb089a540d2262c' 'b845de3e05c1734cce4b9ac5e8f1baaf' - 'f5b2f4ed26a3099e66163040811ea2bd' + '9d0f4f216fa9d4650f759db14c3270db' '8b7dce4a3a0a281fa6656aa8781a648e' 'f7f2dc11d1ba454cd25eeaa133104b62' '824e49d9b01fed295c704ab68908b464' diff --git a/abs/core/LinHES-config/mv_ir.py b/abs/core/LinHES-config/mv_ir.py index 658a118..40e5fee 100755 --- a/abs/core/LinHES-config/mv_ir.py +++ b/abs/core/LinHES-config/mv_ir.py @@ -157,7 +157,7 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType,remotebucket): def setup_ir_receiver(ReceiverType,TEMPLATES,HDHRlirc_device,myip): logging.info(" Configuring receiver %s", ReceiverType) - if ReceiverType == "Serial": + if ReceiverType == "serial": scrub_modules("/etc/modules.mythvantage","lirc") add_module("/etc/modules.mythvantage","lirc_serial #lirc") cmd = "load-modules-mythvantage.sh" @@ -184,6 +184,7 @@ def setup_ir_receiver(ReceiverType,TEMPLATES,HDHRlirc_device,myip): mv_common.runcmd(cmd) mv_common.remove_service("igdaemon") mv_common.remove_service("tatir") + elif ReceiverType == "pvr150": scrub_modules("/etc/modules.mythvantage","lirc") add_module("/etc/modules.mythvantage","lirc_i2c #lirc") @@ -208,10 +209,14 @@ def setup_ir_receiver(ReceiverType,TEMPLATES,HDHRlirc_device,myip): elif ReceiverType == "SiliconDust_HDHR": mv_common.remove_service("igdaemon") mv_common.remove_service("tatir") - cmd = '''hdhomerun_config %s set /ir/target %s:5000 store''' %(HDHRlirc_device,myip) + cmd = '''hdhomerun_config %s set /ir/target "%s:5000 no_clear"''' %(HDHRlirc_device,myip) + print cmd + mv_common.runcmd(cmd) + cmd = '''hdhomerun_config %s set /ir/target "%s:5000 store"''' %(HDHRlirc_device,myip) print cmd mv_common.runcmd(cmd) + else: logging.debug(" didn't match receiver, using genric case") scrub_modules("/etc/modules.mythvantage","lirc") @@ -249,7 +254,9 @@ def setup_blaster_transmiter(HostBlasterType): if HostBlasterType == "no blaster": scrub_modules("/etc/modules.mythvantage","blaster") - elif HostBlasterType == "Serial": + elif HostBlasterType == "iguanaIR-usb": + mv_common.add_service("igdaemon") + elif HostBlasterType == "serial": scrub_modules("/etc/modules.mythvantage","blaster") add_module("/etc/modules/.mythvantage","lirc_serial #blaster") cmd = "load-modules-mythvantage.sh" diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD index 05ffece..7a953a5 100644 --- a/abs/core/mythinstall/PKGBUILD +++ b/abs/core/mythinstall/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jams pkgname=mythinstall pkgver=3 -pkgrel=73 +pkgrel=76 pkgdesc="LinHES installer/systemconfig GUI." arch=('i686' 'x86_64') depends=('mythtv>=0.25') -- cgit v0.12