From d0ee69265cf9bb315f0481d643413b80f80415a8 Mon Sep 17 00:00:00 2001 From: Keine_Ahnung Date: Wed, 1 May 2013 20:17:15 +0200 Subject: changed PLUGIN_UACTIVITY_COMMAND Renamed Run to uactivityRun k_Setup to kNone Extra Error check for #20-yaUSBir_watchdog Changed activity script parameters from command line to enviromet (key and watchdog scripts also changed) New info value "UACTIVITY_INFO_VIDEODIR" Fixed missing Symbol Error from commit e01109af --- script/uactivity/key/#10-syslog_demo | 34 +++++++++++++-------- script/uactivity/key/#20-toggle_demo | 18 ++++++----- script/uactivity/watchdog/#10-syslog_demo | 42 +++++++++++++++----------- script/uactivity/watchdog/#20-yaUSBir_watchdog | 3 +- 4 files changed, 58 insertions(+), 39 deletions(-) (limited to 'script/uactivity') diff --git a/script/uactivity/key/#10-syslog_demo b/script/uactivity/key/#10-syslog_demo index ee794a7..767ee55 100755 --- a/script/uactivity/key/#10-syslog_demo +++ b/script/uactivity/key/#10-syslog_demo @@ -1,29 +1,37 @@ #!/bin/sh -case "${1}" in +case "${UACTIVITY_ORGIN}" in startup) logger -t "uactivity [key/$(basename ${0})]" "key starting up" - logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory: ${3}" - logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory: ${4}" - logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${5}" + logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}" + logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}" + logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}" + logger -t "uactivity [key/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}" + logger -t "uactivity [key/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}" ;; started) logger -t "uactivity [key/$(basename ${0})]" "key started" - logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory: ${3}" - logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory: ${4}" - logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${5}" + logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}" + logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}" + logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}" + logger -t "uactivity [key/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}" + logger -t "uactivity [key/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}" ;; shutdown) logger -t "uactivity [key/$(basename ${0})]" "key shutting down" - logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory: ${3}" - logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory: ${4}" - logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${5}" + logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}" + logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}" + logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}" + logger -t "uactivity [key/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}" + logger -t "uactivity [key/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}" ;; running) logger -t "uactivity [key/$(basename ${0})]" "key \"${2}\" pressed" - logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory: ${3}" - logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory: ${4}" - logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${5}" + logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}" + logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}" + logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}" + logger -t "uactivity [key/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}" + logger -t "uactivity [key/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}" ;; esac diff --git a/script/uactivity/key/#20-toggle_demo b/script/uactivity/key/#20-toggle_demo index 3ec3cfb..1127a2e 100755 --- a/script/uactivity/key/#20-toggle_demo +++ b/script/uactivity/key/#20-toggle_demo @@ -1,27 +1,29 @@ #!/bin/sh # do not use names starting with [0-9][0-9] for data files -FLAG="${4}/key/flag.$(basename ${0})" +FLAG_DIR="${UACTIVITY_CACHEDIRECTORY}/key/$(basename ${0}).data" +FLAG_FILE="${FLAG_DIR}/flag" + -case "${1}" in +case "${UACTIVITY_ORGIN}" in startup) # create flag directory (using cache directory) - mkdir -p "${4}/key/" + mkdir -p "${FLAG_DIR}" # delete flag (may leftover from previus vdr crash) # kepp the flag if toggle state should be keep over vdr sessions - rm -f "${FLAG}" + rm -f "${FLAG_FILE}" ;; running) # we are interested in Key "1" - if [ "${2}" = "1" ]; then - if [ -f "${FLAG}" ]; then + if [ "${UACTIVITY_INFO_KEY}" = "1" ]; then + if [ -f "${FLAG_FILE}" ]; then # here we do our "off" action logger -t "uactivity [key/$(basename ${0})]" "$(basename ${0}) off" - rm -f "${FLAG}" + rm -f "${FLAG_FILE}" else # here we do our "on" action logger -t "uactivity [key/$(basename ${0})]" "$(basename ${0}) on" - touch "${FLAG}" + touch "${FLAG_FILE}" fi fi ;; diff --git a/script/uactivity/watchdog/#10-syslog_demo b/script/uactivity/watchdog/#10-syslog_demo index 8ff6ca3..bcb36b7 100755 --- a/script/uactivity/watchdog/#10-syslog_demo +++ b/script/uactivity/watchdog/#10-syslog_demo @@ -1,41 +1,49 @@ #!/bin/sh -case "${1}" in +case "${UACTIVITY_ORGIN}" in startup) logger -t "uactivity [watchdog/$(basename ${0})]" "watchdog starting up" - [ "${2}" = "true" ] \ + [ "${UACTIVITY_INFO_ACTIVITY}" = "true" ] \ && logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user active\"" \ || logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user inactive\"" - logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${3}" - logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${4}" - logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${5}" + logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}" ;; started) logger -t "uactivity [watchdog/$(basename ${0})]" "watchdog started" - [ "${2}" = "true" ] \ + [ "${UACTIVITY_INFO_ACTIVITY}" = "true" ] \ && logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user active\"" \ || logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user inactive\"" - logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${3}" - logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${4}" - logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${5}" + logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}" ;; shutdown) logger -t "uactivity [watchdog/$(basename ${0})]" "watchdog shutting down" - [ "${2}" = "true" ] \ + [ "${UACTIVITY_INFO_ACTIVITY}" = "true" ] \ && logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user active\"" \ || logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user inactive\"" - logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${3}" - logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${4}" - logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${5}" + logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}" ;; running) logger -t "uactivity [watchdog/$(basename ${0})]" "watchdog triggered" - [ "${2}" = "true" ] \ + [ "${UACTIVITY_INFO_ACTIVITY}" = "true" ] \ && logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user active\"" \ || logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user inactive\"" - logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${3}" - logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${4}" - logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${5}" + logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}" ;; esac diff --git a/script/uactivity/watchdog/#20-yaUSBir_watchdog b/script/uactivity/watchdog/#20-yaUSBir_watchdog index d6e70dc..4307a55 100755 --- a/script/uactivity/watchdog/#20-yaUSBir_watchdog +++ b/script/uactivity/watchdog/#20-yaUSBir_watchdog @@ -13,6 +13,7 @@ IRSEND="irsend -d /var/run/lirc/ya_usbir SEND_ONCE yaUsbIR_control C_WATCHDOG %s trigger_watchdog(){ # Calculate n1, n2 and n3 values + OK=false eval $(bc < /dev/null watchdog = ${WATCHDOG_TIME} @@ -57,7 +58,7 @@ deactivate_watchdog(){ -case "${1}" in +case "${UACTIVITY_ORGIN}" in startup) trigger_watchdog || exit 1 ;; -- cgit v1.2.3