From 97f900886c6d7e848721d10672521901d4b310cb Mon Sep 17 00:00:00 2001 From: Joerg Bornkessel Date: Mon, 2 Mar 2015 22:19:21 +0100 Subject: bump; update license info, call include on later lines --- etc/init.d/vdr | 1 + etc/init.d/vdr-x11 | 2 +- usr/share/vdr/bin/vdrrecord-gate.sh | 6 +++--- usr/share/vdr/bin/vdrshutdown-gate.sh | 4 +++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/etc/init.d/vdr b/etc/init.d/vdr index 0b1644f..e82e94e 100644 --- a/etc/init.d/vdr +++ b/etc/init.d/vdr @@ -1,4 +1,5 @@ #!/sbin/runscript +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/etc/init.d/vdr-x11 b/etc/init.d/vdr-x11 index f0b6cae..be98d10 100644 --- a/etc/init.d/vdr-x11 +++ b/etc/init.d/vdr-x11 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $ID: $ +# $Id$ description="Start minimal X server for VDR" diff --git a/usr/share/vdr/bin/vdrrecord-gate.sh b/usr/share/vdr/bin/vdrrecord-gate.sh index cea3465..8e733d5 100644 --- a/usr/share/vdr/bin/vdrrecord-gate.sh +++ b/usr/share/vdr/bin/vdrrecord-gate.sh @@ -6,9 +6,6 @@ # This is a multiplexer for all things vdr can call with vdr -r script (e.g. noad ...) # 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 exec /usr/share/vdr/bin/vdr-bg.sh "${0}" "${@}" @@ -20,6 +17,9 @@ OLD_HOOKDIR=/usr/lib/vdr/record . /usr/share/vdr/inc/functions.sh +include svdrpcmd +svdrp_command + mesg() { "${SVDRPCMD}" MESG "\"$@\"" } diff --git a/usr/share/vdr/bin/vdrshutdown-gate.sh b/usr/share/vdr/bin/vdrshutdown-gate.sh index a850782..e09340f 100644 --- a/usr/share/vdr/bin/vdrshutdown-gate.sh +++ b/usr/share/vdr/bin/vdrshutdown-gate.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: vdrshutdown-gate.sh 625 2008-07-06 12:59:34Z zzam $ +# $Id$ # Author: # Matthias Schwarzott # Various other contributors from gentoo.de @@ -8,6 +8,8 @@ # privileged commands. Start visudo and add a line like # vdr ALL= NOPASSWD: /usr/share/vdr/bin/vdrshutdown-really.sh +. /usr/share/vdr/inc/functions.sh + include svdrpcmd svdrp_command -- cgit v1.2.3-65-gdbad