diff options
| author | Keine_Ahnung <no@mail.com> | 2013-01-26 15:45:58 +0100 |
|---|---|---|
| committer | Keine_Ahnung <no@mail.com> | 2013-01-26 15:45:58 +0100 |
| commit | 573880e2e07794dbe799907e6a0fc6a7ede7b29b (patch) | |
| tree | ced594e6cb5b3dd46c494763e1cbf104836c27d6 /script/uactivity | |
| parent | 41d28a0f15e5bcf78ab17a6a9fd07bf4272bc04c (diff) | |
| download | vdr-plugin-uactivity-573880e2e07794dbe799907e6a0fc6a7ede7b29b.tar.gz vdr-plugin-uactivity-573880e2e07794dbe799907e6a0fc6a7ede7b29b.tar.bz2 | |
some bug fixes
Diffstat (limited to 'script/uactivity')
| -rw-r--r-- | script/uactivity/activity/-10-syslog_demo | 4 | ||||
| -rw-r--r-- | script/uactivity/activity/-20-switch_tv | 2 | ||||
| -rw-r--r-- | script/uactivity/key/-20-toggle_demo | 28 |
3 files changed, 18 insertions, 16 deletions
diff --git a/script/uactivity/activity/-10-syslog_demo b/script/uactivity/activity/-10-syslog_demo index 2ea25ee..8c16823 100644 --- a/script/uactivity/activity/-10-syslog_demo +++ b/script/uactivity/activity/-10-syslog_demo @@ -5,7 +5,7 @@ case "${1}" in logger -t "uactivity [activity/$(basename ${0})]" "activity starting up" [ "${2}" = "true" ] \ && logger -t "uactivity [activity/$(basename ${0})]" "status \"user active\"" \ - || logger -t "uactivity [activity/$(basename ${0})]" "status \"user inactive\" + || logger -t "uactivity [activity/$(basename ${0})]" "status \"user inactive\"" logger -t "uactivity [activity/$(basename ${0})]" "ConfigDirectory: ${3}" logger -t "uactivity [activity/$(basename ${0})]" "CacheDirectory: ${4}" logger -t "uactivity [activity/$(basename ${0})]" "ResourceDirectory: ${5}" @@ -14,7 +14,7 @@ case "${1}" in logger -t "uactivity [activity/$(basename ${0})]" "activity shutting down" [ "${2}" = "true" ] \ && logger -t "uactivity [activity/$(basename ${0})]" "status \"user active\"" \ - || logger -t "uactivity [activity/$(basename ${0})]" "status \"user inactive\" + || logger -t "uactivity [activity/$(basename ${0})]" "status \"user inactive\"" logger -t "uactivity [activity/$(basename ${0})]" "ConfigDirectory: ${3}" logger -t "uactivity [activity/$(basename ${0})]" "CacheDirectory: ${4}" logger -t "uactivity [activity/$(basename ${0})]" "ResourceDirectory: ${5}" diff --git a/script/uactivity/activity/-20-switch_tv b/script/uactivity/activity/-20-switch_tv index 0322c67..f014e6f 100644 --- a/script/uactivity/activity/-20-switch_tv +++ b/script/uactivity/activity/-20-switch_tv @@ -1,6 +1,6 @@ #!/bin/sh -[ "${2}" = "true" ] \ +([ "${2}" = "true" ] && [ "${1}" != "shutdown" ]) \ && irsend -d /var/run/lirc/ya_usbir SEND_ONCE TP av \ || irsend -d /var/run/lirc/ya_usbir SEND_ONCE TP off diff --git a/script/uactivity/key/-20-toggle_demo b/script/uactivity/key/-20-toggle_demo index e5e1a1e..a3752fd 100644 --- a/script/uactivity/key/-20-toggle_demo +++ b/script/uactivity/key/-20-toggle_demo @@ -1,25 +1,27 @@ #!/bin/sh -# we are interested in Key "1" -[ "${2}" != "1" ] && exit 0 +FLAG="${4}/key/flag.$(basename ${0})" case "${1}" in startup) # create flag directory (using cache directory) - mkdir -p ${4}/key/ + mkdir -p "${4}/key/" # delete flag - rm -f ${4}/key/$(basename ${0}).flag + rm -f "${FLAG}" ;; running) - if [ -f "${4}/key/flag.$(basename ${0})" ]; then - # here we do our "off" action - logger -t "uactivity [key/$(basename ${0})]" "$(basename ${0}) off" - rm -f "${4}/key/flag.$(basename ${0})" - else - # here we do our "on" action - logger -t "uactivity [key/$(basename ${0})]" "$(basename ${0}) on" - # do not use names starting with [0-9][0-9] for data files - touch "${4}/key/flag.$(basename ${0})" + # we are interested in Key "1" + if [ "${2}" = "1" ]; then + if [ -f "${FLAG}" ]; then + # here we do our "off" action + logger -t "uactivity [key/$(basename ${0})]" "$(basename ${0}) off" + rm -f "${FLAG}" + else + # here we do our "on" action + logger -t "uactivity [key/$(basename ${0})]" "$(basename ${0}) on" + # do not use names starting with [0-9][0-9] for data files + touch "${FLAG}" + fi fi ;; esac |