diff options
| author |   Joerg Bornkessel <hd_brummy@gentoo.org> | 2013-03-30 13:11:59 +0100 |
|---|---|---|
| committer | Joerg Bornkessel <hd_brummy@gentoo.org> | 2013-03-30 13:11:59 +0100 |
| commit | a091adb362192954e969fc467049544a4cd28f6f (patch) | |
| tree | b9033ecc00008ba2872226a89a34e2ad7508c6d7 /usr/share | |
| parent | Bumped to version 2.0.0_rc2 (diff) | |
| download | gentoo-vdr-scripts-a091adb362192954e969fc467049544a4cd28f6f.tar.gz gentoo-vdr-scripts-a091adb362192954e969fc467049544a4cd28f6f.tar.bz2 gentoo-vdr-scripts-a091adb362192954e969fc467049544a4cd28f6f.zip | |
cleanup from old code, depended for "old" vdr versions
Diffstat (limited to 'usr/share')
| -rw-r--r--[-rwxr-xr-x] | usr/share/vdr/bin/vdr-bg.sh | 0 | ||||
| -rw-r--r-- | usr/share/vdr/bin/vdrrecord-gate.sh | 3 | ||||
| -rw-r--r-- | usr/share/vdr/bin/vdrshutdown-gate.sh | 3 | ||||
| -rw-r--r-- | usr/share/vdr/bin/vdrshutdown-periodic-thread.sh | 1 | ||||
| -rw-r--r-- | usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh | 1 | ||||
| -rw-r--r-- | usr/share/vdr/shutdown/pre-shutdown-05-time-calculations.sh | 6 |
6 files changed, 6 insertions, 8 deletions
diff --git a/usr/share/vdr/bin/vdr-bg.sh b/usr/share/vdr/bin/vdr-bg.sh index 87f8998..87f8998 100755..100644 --- a/usr/share/vdr/bin/vdr-bg.sh +++ b/usr/share/vdr/bin/vdr-bg.sh diff --git a/usr/share/vdr/bin/vdrrecord-gate.sh b/usr/share/vdr/bin/vdrrecord-gate.sh index 2c1fdca..cea3465 100644 --- a/usr/share/vdr/bin/vdrrecord-gate.sh +++ b/usr/share/vdr/bin/vdrrecord-gate.sh @@ -7,6 +7,7 @@ # It calls all shell-scripts located in /usr/share/vdr/record in alphabetical order include svdrpcmd +svdrp_command #fork to background if [ -z "${EXECUTED_BY_VDR_BG}" ]; then @@ -19,8 +20,6 @@ OLD_HOOKDIR=/usr/lib/vdr/record . /usr/share/vdr/inc/functions.sh -svdrp_command - mesg() { "${SVDRPCMD}" MESG "\"$@\"" } diff --git a/usr/share/vdr/bin/vdrshutdown-gate.sh b/usr/share/vdr/bin/vdrshutdown-gate.sh index 8d7ccf1..a850782 100644 --- a/usr/share/vdr/bin/vdrshutdown-gate.sh +++ b/usr/share/vdr/bin/vdrshutdown-gate.sh @@ -9,6 +9,7 @@ # vdr ALL= NOPASSWD: /usr/share/vdr/bin/vdrshutdown-really.sh include svdrpcmd +svdrp_command #fork to background if [ -z "${EXECUTED_BY_VDR_BG}" ]; then @@ -16,8 +17,6 @@ if [ -z "${EXECUTED_BY_VDR_BG}" ]; then exit fi -svdrp_command - mesg() { "${SVDRPCMD}" MESG "$@" } diff --git a/usr/share/vdr/bin/vdrshutdown-periodic-thread.sh b/usr/share/vdr/bin/vdrshutdown-periodic-thread.sh index 10dedfa..a1b6c2e 100644 --- a/usr/share/vdr/bin/vdrshutdown-periodic-thread.sh +++ b/usr/share/vdr/bin/vdrshutdown-periodic-thread.sh @@ -9,6 +9,7 @@ # . /usr/share/vdr/inc/functions.sh + include shutdown-functions read_caps diff --git a/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh b/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh index b19a070..661e2a7 100644 --- a/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh +++ b/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh @@ -16,6 +16,7 @@ if [ "$(id -u)" != "0" ]; then fi . /usr/share/vdr/inc/functions.sh + include shutdown-functions shutdown_script_dir=/usr/share/vdr/shutdown diff --git a/usr/share/vdr/shutdown/pre-shutdown-05-time-calculations.sh b/usr/share/vdr/shutdown/pre-shutdown-05-time-calculations.sh index 059841a..2817923 100644 --- a/usr/share/vdr/shutdown/pre-shutdown-05-time-calculations.sh +++ b/usr/share/vdr/shutdown/pre-shutdown-05-time-calculations.sh @@ -8,8 +8,7 @@ print_localtime () date --date="1970-01-01 UTC ${1} seconds" } -catch_running_timer() -{ +catch_running_timer() { local NOW=$(date +%s) # Do not wake up on events in past @@ -25,8 +24,7 @@ catch_running_timer() fi } -calculate_wakeup_timer () -{ +calculate_wakeup_timer() { local NEXT_FIXED_WAKEUP=$(date --date=${FIXED_WAKEUP_TIME} +%s) local NOW=$(date +%s) |