From 379220a0d1de8cfe38315b13221f2111d4d1ed95 Mon Sep 17 00:00:00 2001 From: Joerg Bornkessel Date: Wed, 8 Jan 2020 22:08:59 +0100 Subject: several minor fixes whitespace fixed init script header to Gentoo Authors removed useless Id lines Signed-off-by: Joerg Bornkessel --- ChangeLog | 2 ++ Makefile | 2 -- README | 1 - README.grub2 | 1 - README.shutdown-jobs | 1 - README.systemd | 2 -- README.vdrcaps | 1 - README.x11-setup | 2 -- TODO | 1 - etc/conf.d/Makefile | 2 -- etc/init.d/Makefile | 2 -- etc/init.d/vdr | 4 +--- etc/init.d/vdr-x11 | 4 +--- etc/init.d/wakeup-reboot-halt | 4 +--- etc/sudoers.d/Makefile | 2 -- etc/systemd/system/vdr.service.d/Makefile | 2 -- etc/vdr/Makefile | 2 -- etc/vdr/commands/Makefile | 2 -- etc/vdr/commands/commands.custom.conf | 1 - etc/vdr/commands/commands.custom.conf.de | 1 - etc/vdr/commands/commands.system.conf | 1 - etc/vdr/commands/commands.system.conf.de | 1 - etc/vdr/reccmds/Makefile | 2 -- etc/vdr/reccmds/reccmds.custom.conf | 3 +-- usr/Makefile | 2 -- usr/lib/systemd/system/Makefile | 2 -- usr/sbin/Makefile | 2 -- usr/sbin/dvb-reload-modules | 3 +-- usr/sbin/rtc-wakeup.sh | 1 - usr/sbin/vdr-watchdogd | 5 +---- usr/share/portage/config/sets/Makefile | 2 -- usr/share/vdr/Makefile | 2 -- usr/share/vdr/bin/Makefile | 2 -- usr/share/vdr/bin/vdr-bg.sh | 1 - usr/share/vdr/bin/vdrrecord-gate.sh | 1 - usr/share/vdr/bin/vdrshutdown-gate.sh | 1 - usr/share/vdr/bin/vdrshutdown-periodic-thread.sh | 2 -- usr/share/vdr/bin/vdrshutdown-really.sh | 2 +- usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh | 2 +- usr/share/vdr/dvdchanger/Makefile | 2 -- usr/share/vdr/dvdchanger/dvdchanger_writedvd.sh | 2 -- usr/share/vdr/inc/Makefile | 2 -- usr/share/vdr/inc/commands-functions.sh | 2 +- usr/share/vdr/inc/functions.sh | 2 -- usr/share/vdr/inc/language-functions.sh | 1 - usr/share/vdr/inc/plugin-functions.sh | 1 - usr/share/vdr/inc/rc-functions.sh | 1 - usr/share/vdr/inc/shutdown-functions.sh | 1 - usr/share/vdr/inc/time.sh | 1 - usr/share/vdr/rcscript/Makefile | 2 -- usr/share/vdr/rcscript/post-start-05-plugins.sh | 1 - usr/share/vdr/rcscript/post-start-50-svdrp.sh | 1 - usr/share/vdr/rcscript/post-stop-05-plugins.sh | 1 - usr/share/vdr/rcscript/pre-start-10-chuid.sh | 2 +- usr/share/vdr/rcscript/pre-start-20-dvb-device.sh | 2 +- usr/share/vdr/rcscript/pre-start-30-parameter.sh | 2 +- usr/share/vdr/rcscript/pre-start-40-config-files.sh | 2 +- usr/share/vdr/rcscript/pre-start-45-locales.sh | 1 - usr/share/vdr/rcscript/pre-start-45-nptl-check.sh | 2 +- usr/share/vdr/rcscript/pre-start-50-shutdown.sh | 1 - usr/share/vdr/rcscript/pre-start-60-check-syslog-errors.sh | 1 + usr/share/vdr/rcscript/pre-start-95-plugins.sh | 1 - usr/share/vdr/rcscript/pre-start-98-wait-conditions.sh | 2 +- usr/share/vdr/rcscript/pre-stop-95-plugins.sh | 1 - usr/share/vdr/rcscript/watchdog-restart-20-modules.sh | 1 - usr/share/vdr/record/Makefile | 2 -- usr/share/vdr/record/record-10-custom.sh | 1 - usr/share/vdr/shutdown/Makefile | 2 -- usr/share/vdr/shutdown/periodic-50-epgscan.sh | 2 +- usr/share/vdr/shutdown/pre-shutdown-05-time-calculations.sh | 1 - usr/share/vdr/shutdown/pre-shutdown-10-check-enabled.sh | 2 +- usr/share/vdr/shutdown/pre-shutdown-20-check-blocking-programs.sh | 2 +- usr/share/vdr/shutdown/pre-shutdown-30-check-logins.sh | 2 +- usr/share/vdr/shutdown/pre-shutdown-40-time.sh | 1 - usr/share/vdr/shutdown/pre-shutdown-90-systohc.sh | 4 +--- usr/share/vdr/shutdown/pre-shutdown-99-periodic-thread.sh | 2 +- usr/share/vdr/shutdown/shutdown-custom_cmd.sh | 3 ++- usr/share/vdr/shutdown/shutdown-halt.sh | 2 +- usr/share/vdr/shutdown/shutdown-reboot.sh | 2 +- usr/share/vdr/shutdown/wakeup-none.sh | 2 +- usr/share/vdr/shutdown/wakeup-nvram.sh | 4 ++-- usr/share/vdr/shutdown/wakeup-rtc.sh | 2 +- usr/share/vdr/systemd/Makefile | 2 -- usr/share/vdr/systemd/vdr-systemd_helper.sh | 2 -- var/vdr/tmp/Makefile | 2 -- vdrplugin-rebuild/Makefile | 2 -- vdrplugin-rebuild/vdrplugin-rebuild | 2 +- 87 files changed, 33 insertions(+), 127 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6052331..9c034bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,8 @@ - added support for the DISPLAY=:0.0 environment variable (needed for media-plugins/vdr-softhddevice supporting OpenGL OSD) Suggested-by: Lucian Muresan + - whitespace, removed useless Id lines, fixed initsrcipt header to + Gentoo Authors *gentoo-vdr-scripts-2.8 (15 Dec 2019) diff --git a/Makefile b/Makefile index db160e3..2a4247b 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,3 @@ -# $Id$ - SHELL = /bin/bash SUBDIRS = etc usr vdrplugin-rebuild diff --git a/README b/README index 7ca1c91..8bb6764 100644 --- a/README +++ b/README @@ -1,4 +1,3 @@ -# $Id: $ README for gentoo-vdr-scripts Version 2.8 diff --git a/README.grub2 b/README.grub2 index 791d830..fc5dce7 100644 --- a/README.grub2 +++ b/README.grub2 @@ -1,4 +1,3 @@ -# $Id$ # gentoo-vdr-scripts grub2 syntax # example grub2 entry for reboot and default boot kernel diff --git a/README.shutdown-jobs b/README.shutdown-jobs index 3ceeec5..af64450 100644 --- a/README.shutdown-jobs +++ b/README.shutdown-jobs @@ -1,4 +1,3 @@ -# $Id$ Short description of concept of shutdown-thread This is implemented, at least from side of the scripts. diff --git a/README.systemd b/README.systemd index 2683493..908c23e 100644 --- a/README.systemd +++ b/README.systemd @@ -1,5 +1,3 @@ -# $Id$ - Instructions for usage and configuration with systemd diff --git a/README.vdrcaps b/README.vdrcaps index 32e2e2e..0dcf62c 100644 --- a/README.vdrcaps +++ b/README.vdrcaps @@ -1,4 +1,3 @@ -# $Id$ subset of all possible settings in /usr/share/vdr/capabilities.sh CAP_SHUTDOWN_SVDRP - vdr has svdrp command DOWN to trigger a suto-hutdown after inactivity diff --git a/README.x11-setup b/README.x11-setup index d9c3dc2..bd6f8f5 100644 --- a/README.x11-setup +++ b/README.x11-setup @@ -1,5 +1,3 @@ -# $ID: $ - Instructions for usage and configuration with init script vdr-x11 media-plugins/vdr-sofhddevice diff --git a/TODO b/TODO index f47dfe0..da59a90 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,3 @@ -# $Id: $ TODO file for gentoo-vdr-scripts * improve syslog parsing code diff --git a/etc/conf.d/Makefile b/etc/conf.d/Makefile index a6608df..7f67de4 100644 --- a/etc/conf.d/Makefile +++ b/etc/conf.d/Makefile @@ -1,5 +1,3 @@ -# $Id$ - SHELL = /bin/bash MYDIR = $(DESTDIR)/etc/conf.d diff --git a/etc/init.d/Makefile b/etc/init.d/Makefile index a8933a2..5150345 100644 --- a/etc/init.d/Makefile +++ b/etc/init.d/Makefile @@ -1,5 +1,3 @@ -# $Id$ - SHELL = /bin/bash MYDIR = $(DESTDIR)/etc/init.d diff --git a/etc/init.d/vdr b/etc/init.d/vdr index 8668d3d..c16e75c 100644 --- a/etc/init.d/vdr +++ b/etc/init.d/vdr @@ -1,7 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ +# Copyright 1999-2020 Gentoo Authors extra_commands="watchdogrestart" diff --git a/etc/init.d/vdr-x11 b/etc/init.d/vdr-x11 index c8a834f..b1959f4 100644 --- a/etc/init.d/vdr-x11 +++ b/etc/init.d/vdr-x11 @@ -1,7 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ +# Copyright 1999-2020 Gentoo Authors description="Start minimal X server for VDR" diff --git a/etc/init.d/wakeup-reboot-halt b/etc/init.d/wakeup-reboot-halt index 7026696..555b064 100644 --- a/etc/init.d/wakeup-reboot-halt +++ b/etc/init.d/wakeup-reboot-halt @@ -1,7 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ +# Copyright 1999-2020 Gentoo Authors extra_commands="mark_for_reboot" diff --git a/etc/sudoers.d/Makefile b/etc/sudoers.d/Makefile index dc453d6..535fb91 100644 --- a/etc/sudoers.d/Makefile +++ b/etc/sudoers.d/Makefile @@ -1,5 +1,3 @@ -# $Id$ - SHELL = /bin/bash MYDIR = $(DESTDIR)/etc/sudoers.d diff --git a/etc/systemd/system/vdr.service.d/Makefile b/etc/systemd/system/vdr.service.d/Makefile index 3e7256b..68873ab 100644 --- a/etc/systemd/system/vdr.service.d/Makefile +++ b/etc/systemd/system/vdr.service.d/Makefile @@ -1,5 +1,3 @@ -# $Id$ - SHELL = /bin/bash MYDIR = $(DESTDIR)/etc/systemd/system/vdr.service.d diff --git a/etc/vdr/Makefile b/etc/vdr/Makefile index 9505761..cf84026 100644 --- a/etc/vdr/Makefile +++ b/etc/vdr/Makefile @@ -1,5 +1,3 @@ -# $Id$ - SHELL = /bin/bash MYDIR = $(DESTDIR)/etc/vdr diff --git a/etc/vdr/commands/Makefile b/etc/vdr/commands/Makefile index 479e963..692dc72 100644 --- a/etc/vdr/commands/Makefile +++ b/etc/vdr/commands/Makefile @@ -1,5 +1,3 @@ -# $Id$ - SHELL = /bin/bash MYDIR = $(DESTDIR)/etc/vdr/commands diff --git a/etc/vdr/commands/commands.custom.conf b/etc/vdr/commands/commands.custom.conf index 6d6e037..bdec45c 100644 --- a/etc/vdr/commands/commands.custom.conf +++ b/etc/vdr/commands/commands.custom.conf @@ -1,4 +1,3 @@ -# $Id$ # here you can insert your own commands for the commands menue of vdr. # #Syntax: diff --git a/etc/vdr/commands/commands.custom.conf.de b/etc/vdr/commands/commands.custom.conf.de index 25c28ba..5ae0c63 100644 --- a/etc/vdr/commands/commands.custom.conf.de +++ b/etc/vdr/commands/commands.custom.conf.de @@ -1,4 +1,3 @@ -# $Id$ # here you can insert your own commands for the commands menue of vdr. # german version in file with suffix .de # diff --git a/etc/vdr/commands/commands.system.conf b/etc/vdr/commands/commands.system.conf index 70b485c..e443db5 100644 --- a/etc/vdr/commands/commands.system.conf +++ b/etc/vdr/commands/commands.system.conf @@ -1,3 +1,2 @@ -# $Id$ View VDR Start Log: cat /var/vdr/tmp/vdr-start-log diff --git a/etc/vdr/commands/commands.system.conf.de b/etc/vdr/commands/commands.system.conf.de index bf5ddae..65e5742 100644 --- a/etc/vdr/commands/commands.system.conf.de +++ b/etc/vdr/commands/commands.system.conf.de @@ -1,3 +1,2 @@ -# $Id$ VDR Start Log Anzeigen: cat /var/vdr/tmp/vdr-start-log diff --git a/etc/vdr/reccmds/Makefile b/etc/vdr/reccmds/Makefile index ae55c7b..81d2990 100644 --- a/etc/vdr/reccmds/Makefile +++ b/etc/vdr/reccmds/Makefile @@ -1,5 +1,3 @@ -# $Id$ - SHELL = /bin/bash MYDIR = $(DESTDIR)/etc/vdr/reccmds diff --git a/etc/vdr/reccmds/reccmds.custom.conf b/etc/vdr/reccmds/reccmds.custom.conf index ce557fd..d2fb174 100644 --- a/etc/vdr/reccmds/reccmds.custom.conf +++ b/etc/vdr/reccmds/reccmds.custom.conf @@ -1,4 +1,3 @@ -# $Id$ # here you can insert your own commands for the commands # sub menue of a recording in vdr. # @@ -6,4 +5,4 @@ # title : command # #Example: -# search ads : /usr/bin/noad nice +# search ads : /usr/bin/noad nice diff --git a/usr/Makefile b/usr/Makefile index 70596fc..b8b4d25 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -1,5 +1,3 @@ -# $Id$ - SHELL = /bin/bash MYDIR = $(DESTDIR)/usr diff --git a/usr/lib/systemd/system/Makefile b/usr/lib/systemd/system/Makefile index 22e4d71..42effb5 100644 --- a/usr/lib/systemd/system/Makefile +++ b/usr/lib/systemd/system/Makefile @@ -1,5 +1,3 @@ -# $ID: $ - SHELL = /bin/bash MYDIR = $(DESTDIR)/usr/lib/systemd/system diff --git a/usr/sbin/Makefile b/usr/sbin/Makefile index f4cd664..0d1b294 100644 --- a/usr/sbin/Makefile +++ b/usr/sbin/Makefile @@ -1,5 +1,3 @@ -# $Id$ - SHELL = /bin/bash MYDIR = $(DESTDIR)/usr/sbin diff --git a/usr/sbin/dvb-reload-modules b/usr/sbin/dvb-reload-modules index 9c8762b..f50e793 100755 --- a/usr/sbin/dvb-reload-modules +++ b/usr/sbin/dvb-reload-modules @@ -1,5 +1,4 @@ #!/bin/sh -# $Id: watchdog-restart-20-modules.sh 460 2007-06-02 13:27:00Z zzam $ # # Reload all loaded dvb modules @@ -67,7 +66,7 @@ kill_dvb_video_users() { local dev bname name for dev in /sys/class/video4linux/video?; do [ -f "${dev}/name" ] || continue - + name=$(cat "${dev}/name") [ "${name##*av7110}" = "${name}" ] && continue diff --git a/usr/sbin/rtc-wakeup.sh b/usr/sbin/rtc-wakeup.sh index f2f0d24..b6892e7 100755 --- a/usr/sbin/rtc-wakeup.sh +++ b/usr/sbin/rtc-wakeup.sh @@ -1,5 +1,4 @@ #!/bin/sh -# $Id$ ## # based on vdrshutdown-acpi.pl diff --git a/usr/sbin/vdr-watchdogd b/usr/sbin/vdr-watchdogd index 6c9a071..471ab5c 100755 --- a/usr/sbin/vdr-watchdogd +++ b/usr/sbin/vdr-watchdogd @@ -1,7 +1,4 @@ #!/bin/sh -# $Id$ -# -# Distributed under the GPL # # watchdog script to restart vdr after failure # to stop watchdog temporarily touch /tmp/vdr-nowatchdog @@ -67,7 +64,7 @@ trigger_restart() { is_enabled() { [ $enabled = 0 ] && return 1 [ -f /tmp/vdr-nowatchdog ] && return 1 - + return 0 } diff --git a/usr/share/portage/config/sets/Makefile b/usr/share/portage/config/sets/Makefile index 9570063..e179742 100644 --- a/usr/share/portage/config/sets/Makefile +++ b/usr/share/portage/config/sets/Makefile @@ -1,5 +1,3 @@ -# $Id$ - SHELL = /bin/bash MYDIR = $(DESTDIR)/usr/share/portage/config/sets diff --git a/usr/share/vdr/Makefile b/usr/share/vdr/Makefile index 46943ea..539b58e 100644 --- a/usr/share/vdr/Makefile +++ b/usr/share/vdr/Makefile @@ -1,5 +1,3 @@ -# $Id$ - SHELL = /bin/bash MYDIR = $(DESTDIR)/usr/share/vdr diff --git a/usr/share/vdr/bin/Makefile b/usr/share/vdr/bin/Makefile index ffe96b3..0c6f082 100644 --- a/usr/share/vdr/bin/Makefile +++ b/usr/share/vdr/bin/Makefile @@ -1,5 +1,3 @@ -# $Id$ - SHELL = /bin/bash MYDIR = $(DESTDIR)/usr/share/vdr/bin diff --git a/usr/share/vdr/bin/vdr-bg.sh b/usr/share/vdr/bin/vdr-bg.sh index 87f8998..16958f6 100644 --- a/usr/share/vdr/bin/vdr-bg.sh +++ b/usr/share/vdr/bin/vdr-bg.sh @@ -1,5 +1,4 @@ #!/bin/sh -# $Id$ # # Start command in background and disconnects outputs. # Use this instead of echo "..." | at now diff --git a/usr/share/vdr/bin/vdrrecord-gate.sh b/usr/share/vdr/bin/vdrrecord-gate.sh index a2a7882..7f5c45e 100644 --- a/usr/share/vdr/bin/vdrrecord-gate.sh +++ b/usr/share/vdr/bin/vdrrecord-gate.sh @@ -1,5 +1,4 @@ #!/bin/sh -# $Id$ # Author: # Matthias Schwarzott # diff --git a/usr/share/vdr/bin/vdrshutdown-gate.sh b/usr/share/vdr/bin/vdrshutdown-gate.sh index e09340f..5444251 100644 --- a/usr/share/vdr/bin/vdrshutdown-gate.sh +++ b/usr/share/vdr/bin/vdrshutdown-gate.sh @@ -1,5 +1,4 @@ #!/bin/sh -# $Id$ # Author: # Matthias Schwarzott # Various other contributors from gentoo.de diff --git a/usr/share/vdr/bin/vdrshutdown-periodic-thread.sh b/usr/share/vdr/bin/vdrshutdown-periodic-thread.sh index a1b6c2e..5a94ccc 100644 --- a/usr/share/vdr/bin/vdrshutdown-periodic-thread.sh +++ b/usr/share/vdr/bin/vdrshutdown-periodic-thread.sh @@ -1,6 +1,4 @@ #!/bin/sh -# $Id$ - # # Called from shutdown to execute some tasks before # shutting down the system (when activated). diff --git a/usr/share/vdr/bin/vdrshutdown-really.sh b/usr/share/vdr/bin/vdrshutdown-really.sh index bdfa425..83fb803 100644 --- a/usr/share/vdr/bin/vdrshutdown-really.sh +++ b/usr/share/vdr/bin/vdrshutdown-really.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id$ +# # Author: # Matthias Schwarzott # Joerg Bornkessel diff --git a/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh b/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh index 661e2a7..1bd830a 100644 --- a/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh +++ b/usr/share/vdr/bin/vdrshutdown-wakeup-helper.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id$ +# # Author: # Matthias Schwarzott # diff --git a/usr/share/vdr/dvdchanger/Makefile b/usr/share/vdr/dvdchanger/Makefile index 77cdb32..5fda160 100644 --- a/usr/share/vdr/dvdchanger/Makefile +++ b/usr/share/vdr/dvdchanger/Makefile @@ -1,5 +1,3 @@ -# $Id$ - SHELL = /bin/bash MYDIR = $(DESTDIR)/usr/share/vdr/dvdchanger diff --git a/usr/share/vdr/dvdchanger/dvdchanger_writedvd.sh b/usr/share/vdr/dvdchanger/dvdchanger_writedvd.sh index 9aac168..277dc3f 100755 --- a/usr/share/vdr/dvdchanger/dvdchanger_writedvd.sh +++ b/usr/share/vdr/dvdchanger/dvdchanger_writedvd.sh @@ -1,7 +1,5 @@ #!/bin/bash # -# $Header: /var/cvsroot/gentoo-x86/media-tv/vdr-dvd-scripts/files/0.0.3/dvdchanger_writedvd.sh,v 1.1 2007/07/21 22:40:13 hd_brummy Exp $ -# # 04 Mar 2006; Joerg Bornkessel # addaptded to gentoo-vdr-scripts diff --git a/usr/share/vdr/inc/Makefile b/usr/share/vdr/inc/Makefile index 3350d9f..5bc3968 100644 --- a/usr/share/vdr/inc/Makefile +++ b/usr/share/vdr/inc/Makefile @@ -1,5 +1,3 @@ -# $Id$ - SHELL = /bin/bash MYDIR = $(DESTDIR)/usr/share/vdr/inc diff --git a/usr/share/vdr/inc/commands-functions.sh b/usr/share/vdr/inc/commands-functions.sh index dcb23c7..31a677a 100644 --- a/usr/share/vdr/inc/commands-functions.sh +++ b/usr/share/vdr/inc/commands-functions.sh @@ -1,4 +1,4 @@ -# $Id$ +# include language-functions # merging the files under /etc/vdr/commands/ to one single file under /var/vdr/merged-config-files/ and links diff --git a/usr/share/vdr/inc/functions.sh b/usr/share/vdr/inc/functions.sh index f658125..2546451 100644 --- a/usr/share/vdr/inc/functions.sh +++ b/usr/share/vdr/inc/functions.sh @@ -1,5 +1,3 @@ -# $Id$ - # Handle inclusion of script-helper-files include() { diff --git a/usr/share/vdr/inc/language-functions.sh b/usr/share/vdr/inc/language-functions.sh index de40c72..c36e7e8 100644 --- a/usr/share/vdr/inc/language-functions.sh +++ b/usr/share/vdr/inc/language-functions.sh @@ -1,4 +1,3 @@ -# $Id$ # Reads the language setting of vdr to localize the messages # of start/shutdown-scripts diff --git a/usr/share/vdr/inc/plugin-functions.sh b/usr/share/vdr/inc/plugin-functions.sh index b2b3974..93dd872 100644 --- a/usr/share/vdr/inc/plugin-functions.sh +++ b/usr/share/vdr/inc/plugin-functions.sh @@ -1,4 +1,3 @@ -# $Id$ # Manages loading of plugins (i.e. creating command-line-options for vdr) diff --git a/usr/share/vdr/inc/rc-functions.sh b/usr/share/vdr/inc/rc-functions.sh index 10b28e9..feab62d 100644 --- a/usr/share/vdr/inc/rc-functions.sh +++ b/usr/share/vdr/inc/rc-functions.sh @@ -1,4 +1,3 @@ -# $Id$ # Contains: # manage all vdr-command-line-options diff --git a/usr/share/vdr/inc/shutdown-functions.sh b/usr/share/vdr/inc/shutdown-functions.sh index 1814719..2fe29d8 100644 --- a/usr/share/vdr/inc/shutdown-functions.sh +++ b/usr/share/vdr/inc/shutdown-functions.sh @@ -1,4 +1,3 @@ -# $Id$ # # Reading of shutdown-config-file and setting some default-values diff --git a/usr/share/vdr/inc/time.sh b/usr/share/vdr/inc/time.sh index b89e37f..4782df0 100644 --- a/usr/share/vdr/inc/time.sh +++ b/usr/share/vdr/inc/time.sh @@ -1,4 +1,3 @@ -# $Id$ # # Only contains checking of time-intervals for diff --git a/usr/share/vdr/rcscript/Makefile b/usr/share/vdr/rcscript/Makefile index 322e77a..529bcae 100644 --- a/usr/share/vdr/rcscript/Makefile +++ b/usr/share/vdr/rcscript/Makefile @@ -1,5 +1,3 @@ -# $Id$ - SHELL = /bin/bash MYDIR = $(DESTDIR)/usr/share/vdr/rcscript diff --git a/usr/share/vdr/rcscript/post-start-05-plugins.sh b/usr/share/vdr/rcscript/post-start-05-plugins.sh index 3e20099..615da5b 100644 --- a/usr/share/vdr/rcscript/post-start-05-plugins.sh +++ b/usr/share/vdr/rcscript/post-start-05-plugins.sh @@ -1,4 +1,3 @@ -# $Id$ addon_main() { loop_all_plugins plugin_post_vdr_start diff --git a/usr/share/vdr/rcscript/post-start-50-svdrp.sh b/usr/share/vdr/rcscript/post-start-50-svdrp.sh index d6038f2..f5fa281 100644 --- a/usr/share/vdr/rcscript/post-start-50-svdrp.sh +++ b/usr/share/vdr/rcscript/post-start-50-svdrp.sh @@ -1,4 +1,3 @@ -# $Id$ include rc-functions diff --git a/usr/share/vdr/rcscript/post-stop-05-plugins.sh b/usr/share/vdr/rcscript/post-stop-05-plugins.sh index b9e66ad..f9ce501 100644 --- a/usr/share/vdr/rcscript/post-stop-05-plugins.sh +++ b/usr/share/vdr/rcscript/post-stop-05-plugins.sh @@ -1,4 +1,3 @@ -# $Id$ addon_main() { loop_all_plugins plugin_post_vdr_stop diff --git a/usr/share/vdr/rcscript/pre-start-10-chuid.sh b/usr/share/vdr/rcscript/pre-start-10-chuid.sh index 42a8e93..56a8c3b 100644 --- a/usr/share/vdr/rcscript/pre-start-10-chuid.sh +++ b/usr/share/vdr/rcscript/pre-start-10-chuid.sh @@ -1,4 +1,4 @@ -# $Id$ + addon_main() { yesno "${START_VDR_AS_ROOT}" && return 0 diff --git a/usr/share/vdr/rcscript/pre-start-20-dvb-device.sh b/usr/share/vdr/rcscript/pre-start-20-dvb-device.sh index 4fa4b68..179e849 100644 --- a/usr/share/vdr/rcscript/pre-start-20-dvb-device.sh +++ b/usr/share/vdr/rcscript/pre-start-20-dvb-device.sh @@ -1,4 +1,4 @@ -# $Id$ + check_dvbdevice() { [ -e /dev/dvb/adapter0/frontend0 ] || return 1 return 0 diff --git a/usr/share/vdr/rcscript/pre-start-30-parameter.sh b/usr/share/vdr/rcscript/pre-start-30-parameter.sh index 9812f48..84ffdad 100644 --- a/usr/share/vdr/rcscript/pre-start-30-parameter.sh +++ b/usr/share/vdr/rcscript/pre-start-30-parameter.sh @@ -1,4 +1,4 @@ -# $Id$ + include rc-functions addon_main() { diff --git a/usr/share/vdr/rcscript/pre-start-40-config-files.sh b/usr/share/vdr/rcscript/pre-start-40-config-files.sh index a06d6ac..07eeca6 100644 --- a/usr/share/vdr/rcscript/pre-start-40-config-files.sh +++ b/usr/share/vdr/rcscript/pre-start-40-config-files.sh @@ -1,4 +1,4 @@ -# $Id$ + include commands-functions addon_main() { diff --git a/usr/share/vdr/rcscript/pre-start-45-locales.sh b/usr/share/vdr/rcscript/pre-start-45-locales.sh index 6252a3a..484e4b7 100644 --- a/usr/share/vdr/rcscript/pre-start-45-locales.sh +++ b/usr/share/vdr/rcscript/pre-start-45-locales.sh @@ -1,4 +1,3 @@ -# $Id$ # disable all locale settings from the system # mostly used to get away from utf8 if vdr does diff --git a/usr/share/vdr/rcscript/pre-start-45-nptl-check.sh b/usr/share/vdr/rcscript/pre-start-45-nptl-check.sh index e97b1d7..edea00d 100644 --- a/usr/share/vdr/rcscript/pre-start-45-nptl-check.sh +++ b/usr/share/vdr/rcscript/pre-start-45-nptl-check.sh @@ -1,4 +1,4 @@ -# $Id$ + addon_main() { if yesno "${FORCE_OLD_THREADS:-no}"; then # Test wheather force of old pthreads will work diff --git a/usr/share/vdr/rcscript/pre-start-50-shutdown.sh b/usr/share/vdr/rcscript/pre-start-50-shutdown.sh index 29c1dee..7e6d5d7 100644 --- a/usr/share/vdr/rcscript/pre-start-50-shutdown.sh +++ b/usr/share/vdr/rcscript/pre-start-50-shutdown.sh @@ -1,4 +1,3 @@ -# $Id$ addon_main() { include shutdown-functions diff --git a/usr/share/vdr/rcscript/pre-start-60-check-syslog-errors.sh b/usr/share/vdr/rcscript/pre-start-60-check-syslog-errors.sh index d7b11e3..165d3b8 100644 --- a/usr/share/vdr/rcscript/pre-start-60-check-syslog-errors.sh +++ b/usr/share/vdr/rcscript/pre-start-60-check-syslog-errors.sh @@ -1,3 +1,4 @@ + addon_main() { yesno "${CHECK_SYSLOG_ERRORS:-yes}" || return 0 diff --git a/usr/share/vdr/rcscript/pre-start-95-plugins.sh b/usr/share/vdr/rcscript/pre-start-95-plugins.sh index 227e676..bbe48f5 100644 --- a/usr/share/vdr/rcscript/pre-start-95-plugins.sh +++ b/usr/share/vdr/rcscript/pre-start-95-plugins.sh @@ -1,4 +1,3 @@ -# $Id$ addon_main() { loop_all_plugins plugin_pre_vdr_start diff --git a/usr/share/vdr/rcscript/pre-start-98-wait-conditions.sh b/usr/share/vdr/rcscript/pre-start-98-wait-conditions.sh index bed8120..4097d98 100644 --- a/usr/share/vdr/rcscript/pre-start-98-wait-conditions.sh +++ b/usr/share/vdr/rcscript/pre-start-98-wait-conditions.sh @@ -1,4 +1,4 @@ -# $Id$ + addon_main() { local exitcode=0 if [ "${waitconditions}" ]; then diff --git a/usr/share/vdr/rcscript/pre-stop-95-plugins.sh b/usr/share/vdr/rcscript/pre-stop-95-plugins.sh index 3a203bd..0474a6e 100644 --- a/usr/share/vdr/rcscript/pre-stop-95-plugins.sh +++ b/usr/share/vdr/rcscript/pre-stop-95-plugins.sh @@ -1,4 +1,3 @@ -# $Id$ addon_main() { loop_all_plugins plugin_pre_vdr_stop diff --git a/usr/share/vdr/rcscript/watchdog-restart-20-modules.sh b/usr/share/vdr/rcscript/watchdog-restart-20-modules.sh index e74ed86..c70c8cc 100644 --- a/usr/share/vdr/rcscript/watchdog-restart-20-modules.sh +++ b/usr/share/vdr/rcscript/watchdog-restart-20-modules.sh @@ -1,4 +1,3 @@ -# $Id$ # # Reload modules on a watchdogrestart diff --git a/usr/share/vdr/record/Makefile b/usr/share/vdr/record/Makefile index 3d9b194..d1ce736 100644 --- a/usr/share/vdr/record/Makefile +++ b/usr/share/vdr/record/Makefile @@ -1,5 +1,3 @@ -# $Id$ - SHELL = /bin/bash MYDIR = $(DESTDIR)/usr/share/vdr/record diff --git a/usr/share/vdr/record/record-10-custom.sh b/usr/share/vdr/record/record-10-custom.sh index 4386ef9..9ab7d57 100644 --- a/usr/share/vdr/record/record-10-custom.sh +++ b/usr/share/vdr/record/record-10-custom.sh @@ -1,4 +1,3 @@ -# $Id$ # # In this directory you can add your own commands # being called before and after every recording. diff --git a/usr/share/vdr/shutdown/Makefile b/usr/share/vdr/shutdown/Makefile index c2e4d4e..edcfc53 100644 --- a/usr/share/vdr/shutdown/Makefile +++ b/usr/share/vdr/shutdown/Makefile @@ -1,5 +1,3 @@ -# $Id$ - SHELL = /bin/bash MYDIR = $(DESTDIR)/usr/share/vdr/shutdown diff --git a/usr/share/vdr/shutdown/periodic-50-epgscan.sh b/usr/share/vdr/shutdown/periodic-50-epgscan.sh index 08a6e04..7fcfee1 100644 --- a/usr/share/vdr/shutdown/periodic-50-epgscan.sh +++ b/usr/share/vdr/shutdown/periodic-50-epgscan.sh @@ -1,4 +1,4 @@ -# $Id$ + . /etc/conf.d/vdr.periodic.epgscan include svdrpcmd 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 852969b..c178fe6 100644 --- a/usr/share/vdr/shutdown/pre-shutdown-05-time-calculations.sh +++ b/usr/share/vdr/shutdown/pre-shutdown-05-time-calculations.sh @@ -1,4 +1,3 @@ -# $Id$ : ${FIXED_WAKEUP:=no} : ${FIXED_WAKEUP_TIME:="02:00:00"} diff --git a/usr/share/vdr/shutdown/pre-shutdown-10-check-enabled.sh b/usr/share/vdr/shutdown/pre-shutdown-10-check-enabled.sh index e128e8f..3371d76 100644 --- a/usr/share/vdr/shutdown/pre-shutdown-10-check-enabled.sh +++ b/usr/share/vdr/shutdown/pre-shutdown-10-check-enabled.sh @@ -1,4 +1,4 @@ -# $Id$ + if is_auto_shutdown && ! yesno "${AUTOMATIC_SHUTDOWN:-yes}"; then shutdown_abort_exit "automatic shutdown disabled" fi diff --git a/usr/share/vdr/shutdown/pre-shutdown-20-check-blocking-programs.sh b/usr/share/vdr/shutdown/pre-shutdown-20-check-blocking-programs.sh index fc417c1..f6c1d9d 100644 --- a/usr/share/vdr/shutdown/pre-shutdown-20-check-blocking-programs.sh +++ b/usr/share/vdr/shutdown/pre-shutdown-20-check-blocking-programs.sh @@ -1,4 +1,4 @@ -# $Id$ + SHUTDOWN_CHECK_PROGRAMS="emerge make gcc cc1 transcode vcdimager mencoder tosvcd lame vdrsync.pl tcmplex" SHUTDOWN_CHECK_PROGRAMS="${SHUTDOWN_CHECK_PROGRAMS} tcmplex-panteltje vdr2ac3.sh dvdauthor mkisofs" SHUTDOWN_CHECK_PROGRAMS="${SHUTDOWN_CHECK_PROGRAMS} growisofs cdrdao cdrecord" diff --git a/usr/share/vdr/shutdown/pre-shutdown-30-check-logins.sh b/usr/share/vdr/shutdown/pre-shutdown-30-check-logins.sh index c9c87c9..c5f827d 100644 --- a/usr/share/vdr/shutdown/pre-shutdown-30-check-logins.sh +++ b/usr/share/vdr/shutdown/pre-shutdown-30-check-logins.sh @@ -1,4 +1,4 @@ -# $Id$ + check_logins() { local NR=$(who | wc -l) if [ "${NR}" -gt "0" ]; then diff --git a/usr/share/vdr/shutdown/pre-shutdown-40-time.sh b/usr/share/vdr/shutdown/pre-shutdown-40-time.sh index 5ca379c..dd12ab3 100644 --- a/usr/share/vdr/shutdown/pre-shutdown-40-time.sh +++ b/usr/share/vdr/shutdown/pre-shutdown-40-time.sh @@ -1,4 +1,3 @@ -# $Id$ do_check_time() { if [ -n "${BLOCK_SHUTDOWN_INTERVALS}" ]; then diff --git a/usr/share/vdr/shutdown/pre-shutdown-90-systohc.sh b/usr/share/vdr/shutdown/pre-shutdown-90-systohc.sh index 99463e9..467360f 100644 --- a/usr/share/vdr/shutdown/pre-shutdown-90-systohc.sh +++ b/usr/share/vdr/shutdown/pre-shutdown-90-systohc.sh @@ -7,9 +7,7 @@ do_systohc() { } if yesno "${SHUTDOWN_SYSTOHC:-no}"; then - - if [ ${CLOCK_SYSTOHC:=no} == "no" ] || [ ${clock_systohc:=NO} == "NO" ] ;then + if [ ${CLOCK_SYSTOHC:=no} == "no" ] || [ ${clock_systohc:=NO} == "NO" ] ; then do_systohc fi - fi diff --git a/usr/share/vdr/shutdown/pre-shutdown-99-periodic-thread.sh b/usr/share/vdr/shutdown/pre-shutdown-99-periodic-thread.sh index f0b201b..f7e4d8e 100644 --- a/usr/share/vdr/shutdown/pre-shutdown-99-periodic-thread.sh +++ b/usr/share/vdr/shutdown/pre-shutdown-99-periodic-thread.sh @@ -1,4 +1,4 @@ -# $Id$ + . /etc/conf.d/vdr.periodic.general PERIODIC_THREAD_ENDTIME=${shutdown_data_dir}/periodic_thread_last_ended diff --git a/usr/share/vdr/shutdown/shutdown-custom_cmd.sh b/usr/share/vdr/shutdown/shutdown-custom_cmd.sh index 3a4cda6..59efb34 100644 --- a/usr/share/vdr/shutdown/shutdown-custom_cmd.sh +++ b/usr/share/vdr/shutdown/shutdown-custom_cmd.sh @@ -1,4 +1,5 @@ -# $Id: shutdown-custom_cmd.sh +# +# shutdown-custom_cmd.sh # Author: # Lucian Muresan # diff --git a/usr/share/vdr/shutdown/shutdown-halt.sh b/usr/share/vdr/shutdown/shutdown-halt.sh index f733a0c..1a091b4 100644 --- a/usr/share/vdr/shutdown/shutdown-halt.sh +++ b/usr/share/vdr/shutdown/shutdown-halt.sh @@ -1,4 +1,4 @@ -# $Id$ +# # Author: # Matthias Schwarzott # diff --git a/usr/share/vdr/shutdown/shutdown-reboot.sh b/usr/share/vdr/shutdown/shutdown-reboot.sh index 27859d0..14bb12b 100644 --- a/usr/share/vdr/shutdown/shutdown-reboot.sh +++ b/usr/share/vdr/shutdown/shutdown-reboot.sh @@ -1,4 +1,4 @@ -# $Id$ +# # Author: # Matthias Schwarzott # Various other contributors from gentoo.de diff --git a/usr/share/vdr/shutdown/wakeup-none.sh b/usr/share/vdr/shutdown/wakeup-none.sh index 91ab8b5..a973fde 100644 --- a/usr/share/vdr/shutdown/wakeup-none.sh +++ b/usr/share/vdr/shutdown/wakeup-none.sh @@ -1,4 +1,4 @@ -# $Id$ +# # Author: # Matthias Schwarzott # Various other contributors from gentoo.de diff --git a/usr/share/vdr/shutdown/wakeup-nvram.sh b/usr/share/vdr/shutdown/wakeup-nvram.sh index da450ad..f83a201 100644 --- a/usr/share/vdr/shutdown/wakeup-nvram.sh +++ b/usr/share/vdr/shutdown/wakeup-nvram.sh @@ -1,4 +1,4 @@ -# $Id$ +# # Author: # Matthias Schwarzott # Various other contributors from gentoo.de @@ -26,7 +26,7 @@ case $PIPESTATUS in # all went ok return 0 ;; - + 1) # all went ok - new date and time set. # diff --git a/usr/share/vdr/shutdown/wakeup-rtc.sh b/usr/share/vdr/shutdown/wakeup-rtc.sh index 3f2021b..598fba0 100644 --- a/usr/share/vdr/shutdown/wakeup-rtc.sh +++ b/usr/share/vdr/shutdown/wakeup-rtc.sh @@ -1,4 +1,4 @@ -# $Id$ +# # Author: # Matthias Schwarzott # Various other contributors from gentoo.de diff --git a/usr/share/vdr/systemd/Makefile b/usr/share/vdr/systemd/Makefile index 69d1175..a5a4139 100644 --- a/usr/share/vdr/systemd/Makefile +++ b/usr/share/vdr/systemd/Makefile @@ -1,5 +1,3 @@ -# $Id$ - SHELL = /bin/bash MYDIR = $(DESTDIR)/usr/share/vdr/systemd diff --git a/usr/share/vdr/systemd/vdr-systemd_helper.sh b/usr/share/vdr/systemd/vdr-systemd_helper.sh index f240c35..1003c62 100644 --- a/usr/share/vdr/systemd/vdr-systemd_helper.sh +++ b/usr/share/vdr/systemd/vdr-systemd_helper.sh @@ -7,8 +7,6 @@ # Lucian Muresan < lucianm AT users DOT sourceforge DOT net > # Joerg Bornkessel -# Distributed under the terms of the GNU General Public License v2 - # read our main options . /etc/conf.d/vdr . /etc/conf.d/vdr.watchdogd diff --git a/var/vdr/tmp/Makefile b/var/vdr/tmp/Makefile index 2292897..3ad46b8 100644 --- a/var/vdr/tmp/Makefile +++ b/var/vdr/tmp/Makefile @@ -1,5 +1,3 @@ -#$Id$ - SHELL = /bin/bash MYDIR = $(DESTDIR)/var/vdr/tmp diff --git a/vdrplugin-rebuild/Makefile b/vdrplugin-rebuild/Makefile index 68b0196..6f12b2c 100644 --- a/vdrplugin-rebuild/Makefile +++ b/vdrplugin-rebuild/Makefile @@ -1,5 +1,3 @@ -# $Id$ - SHELL = /bin/bash MYDIR = $(DESTDIR)/usr/sbin diff --git a/vdrplugin-rebuild/vdrplugin-rebuild b/vdrplugin-rebuild/vdrplugin-rebuild index 72576ec..327a2db 100644 --- a/vdrplugin-rebuild/vdrplugin-rebuild +++ b/vdrplugin-rebuild/vdrplugin-rebuild @@ -9,7 +9,7 @@ # This version is based on module-rebuild-0.5 # Changed for vdrplugins by Matthias Schwarzott (zzam@gentoo.org) -# Copyright Gentoo Linux +# Copyright Gentoo Authors # Changed to a new db-format with seperate files for each ebuild. -- cgit v1.2.3-65-gdbad