diff options
| author | Keine_Ahnung <dirk-vdr@gmx.de> | 2013-05-01 20:17:15 +0200 |
|---|---|---|
| committer | Keine_Ahnung <dirk-vdr@gmx.de> | 2013-05-01 20:17:15 +0200 |
| commit | d0ee69265cf9bb315f0481d643413b80f80415a8 (patch) | |
| tree | d1b2d0d5c8fb247f60c4850b5e7749c6f2a923c9 /script/uactivity/watchdog/#10-syslog_demo | |
| parent | 0cd3cd041ce4977cf0c21a83464b5066c1766e2e (diff) | |
| download | vdr-plugin-uactivity-d0ee69265cf9bb315f0481d643413b80f80415a8.tar.gz vdr-plugin-uactivity-d0ee69265cf9bb315f0481d643413b80f80415a8.tar.bz2 | |
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
Diffstat (limited to 'script/uactivity/watchdog/#10-syslog_demo')
| -rwxr-xr-x | script/uactivity/watchdog/#10-syslog_demo | 42 |
1 files changed, 25 insertions, 17 deletions
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 |