diff options
author | Michael Hanson <mihanson@linhes.org> | 2012-04-14 05:13:05 (GMT) |
---|---|---|
committer | Michael Hanson <mihanson@linhes.org> | 2012-04-14 05:13:05 (GMT) |
commit | 5e96cb93d1f17a98a8f8a118b2659ea4d71d3f43 (patch) | |
tree | acde2ddc972337f648a826f3d961dcb8bebf892a /abs/core/LinHES-config/mv_ir.py | |
parent | 8e721470713e6a5a164f1d7682b0d248cb87b03c (diff) | |
parent | 502a19b42d9df3fb3c3e521a37eebd20f9fbd984 (diff) | |
download | linhes_pkgbuild-5e96cb93d1f17a98a8f8a118b2659ea4d71d3f43.zip linhes_pkgbuild-5e96cb93d1f17a98a8f8a118b2659ea4d71d3f43.tar.gz linhes_pkgbuild-5e96cb93d1f17a98a8f8a118b2659ea4d71d3f43.tar.bz2 |
Merge branch 'testing' of linhes.org:linhes_pkgbuild into testing
Conflicts:
abs/extra/bluez/PKGBUILD
abs/extra/bluez/__changelog
Diffstat (limited to 'abs/core/LinHES-config/mv_ir.py')
-rwxr-xr-x | abs/core/LinHES-config/mv_ir.py | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/abs/core/LinHES-config/mv_ir.py b/abs/core/LinHES-config/mv_ir.py index 0e54f92..df6feb5 100755 --- a/abs/core/LinHES-config/mv_ir.py +++ b/abs/core/LinHES-config/mv_ir.py @@ -44,7 +44,7 @@ def setup_lirc_links(mythhome): else: logging.debug(" %s/.lircrc already present",mythhome) else: - logging.debug(" /etc/lircrc does not exisit, can not link it") + logging.debug(" /etc/lircrc does not exist, can not link it") def scrub_modules(filename,module): logging.debug(" scrubbing %s from %s",module,filename) @@ -92,6 +92,8 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType): mv_common.runcmd(cmd) cmd = "mv /etc/lircrc /etc/lircrc-%s" %currenttime mv_common.runcmd(cmd) + cmd = "mv /etc/remote.run /etc/remote.run-%s" %currenttime + mv_common.runcmd(cmd) if os.path.isdir(mythhome+"/remotes/"+Remotetype): @@ -113,6 +115,15 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType): logging.debug(" %s is a dir, skipping",filename) continue include_file("/etc/lircrc",filename) + files = mythhome + "/remotes/" + Remotetype + "/remote.run*" + logging.debug(" Using %s",files) + for filename in glob.glob(files): + # Ignore subfolders + if os.path.isdir (filename): + logging.debug(" %s is a dir, skipping",filename) + continue + cmd = "cp %s /etc/remote.run" %filename + mv_common.runcmd(cmd) else: #template dir files = templates + "/remotes/" + Remotetype + "/lircd*" @@ -131,9 +142,18 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType): logging.debug(" %s is a dir, skipping",filename) continue include_file("/etc/lircrc",filename) + files = templates + "/remotes/" + Remotetype + "/remote.run*" + logging.debug(" Using %s",files) + for filename in glob.glob(files): + # Ignore subfolders + if os.path.isdir (filename): + logging.debug(" %s is a dir, skipping",filename) + continue + cmd = "cp %s /etc/remote.run" %filename + mv_common.runcmd(cmd) - cmd = "chmod 755 /etc/lircrc" + cmd = "chmod 755 /etc/lircrc /etc/remote.run" mv_common.runcmd(cmd) mv_common.add_service("lircd") @@ -365,4 +385,4 @@ def setup_ir(systemconfig, data_config): else: logging.debug(" LCD not defined") logging.info("__End IR\n") - return rc
\ No newline at end of file + return rc |