diff options
Diffstat (limited to 'script')
| -rwxr-xr-x | script/uactivity/key/#10-syslog_demo | 34 | ||||
| -rwxr-xr-x | script/uactivity/key/#20-toggle_demo | 18 | ||||
| -rwxr-xr-x | script/uactivity/watchdog/#10-syslog_demo | 42 | ||||
| -rwxr-xr-x | script/uactivity/watchdog/#20-yaUSBir_watchdog | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | script/vdr-uactivity | 53 |
5 files changed, 78 insertions, 72 deletions
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 <<EOF 2> /dev/null watchdog = ${WATCHDOG_TIME} @@ -57,7 +58,7 @@ deactivate_watchdog(){ -case "${1}" in +case "${UACTIVITY_ORGIN}" in startup) trigger_watchdog || exit 1 ;; diff --git a/script/vdr-uactivity b/script/vdr-uactivity index eecdc3e..f4203cc 100644..100755 --- a/script/vdr-uactivity +++ b/script/vdr-uactivity @@ -9,70 +9,57 @@ mylog() { } usage(){ - ${LOG} "Usage: $(basename $0) -r <reason activity|key|watchdog> -o <orgin startup|shutdown|running> -v <value>" + ${LOG} "Usage: $(basename $0) -r <reason activity|key|watchdog> -o <orgin startup|started|shutdown|running>" ${LOG} " -C <ConfigDirectory> -c <CacheDirectory> -R <ResourceDirectory>" + ${LOG} " -A <activity> -K <Key> -V <Video Directory>" ${LOG} "$cmd_error" exit 1 } cmd_error="" -while getopts ":r:o:v:C:c:R:" opt; do +while getopts "r:o:C:c:R:A:K:V:" opt; do case "$opt" in r) PARAM_REASON="$OPTARG";; o) PARAM_ORGIN="$OPTARG";; - v) PARAM_VALUE="$OPTARG";; C) PARAM_CONFIGDIRECTORY="$OPTARG";; c) PARAM_CACHEDIRECTORY="$OPTARG";; R) PARAM_RESOURCEDIRECTORY="$OPTARG";; + A) PARAM_ACTIVITY="$OPTARG";; + K) PARAM_KEY="$OPTARG";; + V) PARAM_VIDEODIR="$OPTARG";; --) break;; - \?) cmd_error="$(gettext 'Error: Error parsing Commandline')"; break;; + \?) cmd_error="Error: Error parsing Commandline"; break;; esac done [ -n "$cmd_error" ] && usage -# could ovveride the directories for FHS +# we could ovveride the directories for FHS [ -r "${PARAM_CONFIGDIRECTORY}/directories.conf" ] && . "${PARAM_CONFIGDIRECTORY}/directories.conf" +# Exit if nothing to do [ -d "${PARAM_CONFIGDIRECTORY}/${PARAM_REASON}" ] || exit 0 +# Export the Values for the activity scripts +UACTIVITY_ORGIN="${PARAM_ORGIN}" +export UACTIVITY_ORGIN + UACTIVITY_CONFIGDIRECTORY="${PARAM_CONFIGDIRECTORY}" UACTIVITY_CACHEDIRECTORY="${PARAM_CACHEDIRECTORY}" UACTIVITY_RESOURCEDIRECTORY="${PARAM_RESOURCEDIRECTORY}" export UACTIVITY_CONFIGDIRECTORY UACTIVITY_CACHEDIRECTORY UACTIVITY_RESOURCEDIRECTORY -UACTIVITY_ORGIN="${PARAM_ORGIN}" -export UACTIVITY_ORGIN - -case "${PARAM_REASON}" in - activity) - commandline="${PARAM_ORGIN} ${PARAM_VALUE}" - UACTIVITY_ACTIVITY="${PARAM_VALUE}" - export UACTIVITY_ACTIVITY - ;; - key) - if [ "${PARAM_VALUE}" != "_Setup" ]; then - commandline="${PARAM_ORGIN} ${PARAM_VALUE}" - UACTIVITY_KEY="${PARAM_VALUE}" - else - commandline="${PARAM_ORGIN} ''" - UACTIVITY_KEY="" - fi - export UACTIVITY_KEY - ;; - watchdog) - commandline="${PARAM_ORGIN} ${PARAM_VALUE}" - UACTIVITY_ACTIVITY="${PARAM_VALUE}" - export UACTIVITY_ACTIVITY - ;; -esac +UACTIVITY_INFO_ACTIVITY="${PARAM_ACTIVITY}" +UACTIVITY_INFO_KEY="${PARAM_KEY}" +UACTIVITY_INFO_VIDEODIR="${PARAM_VIDEODIR}" +export UACTIVITY_INFO_ACTIVITY UACTIVITY_INFO_KEY UACTIVITY_INFO_VIDEODIR hooks="$(find "${PARAM_CONFIGDIRECTORY}/${PARAM_REASON}" -maxdepth 1 -xtype f -name '[0-9][0-9]*' | sort)" for hook in ${hooks}; do - if [ -x $hook ]; then - eval $hook $commandline "$PARAM_CONFIGDIRECTORY" "$PARAM_CACHEDIRECTORY" "$PARAM_RESOURCEDIRECTORY" + if [ -x "${hook}" ]; then + eval "${hook}" else - eval /bin/sh $hook $commandline "$PARAM_CONFIGDIRECTORY" "$PARAM_CACHEDIRECTORY" "$PARAM_RESOURCEDIRECTORY" + eval /bin/sh "${hook}" fi [ $? -ne 0 ] && ${LOG} "error when executing ${hook}" done |