diff options
| author |   Joerg Bornkessel <hd_brummy@gentoo.org> | 2015-05-08 14:57:32 +0200 |
|---|---|---|
| committer | Joerg Bornkessel <hd_brummy@gentoo.org> | 2015-05-08 14:57:32 +0200 |
| commit | 7f24ddbb0b68d9a2d1cb6be1a90a97b0b1c2c244 (patch) | |
| tree | ebdb40fc6daf66ddbfaa364bd8f9586130b32292 | |
| parent | bump; update license info, call include on later lines (diff) | |
| download | gentoo-vdr-scripts-7f24ddbb0b68d9a2d1cb6be1a90a97b0b1c2c244.tar.gz gentoo-vdr-scripts-7f24ddbb0b68d9a2d1cb6be1a90a97b0b1c2c244.tar.bz2 gentoo-vdr-scripts-7f24ddbb0b68d9a2d1cb6be1a90a97b0b1c2c244.zip | |
whitespace; moved 'source' to '.' to be POSIX compliant, wrt bug 548550;
add Id tags for better versioning info
39 files changed, 61 insertions, 39 deletions
@@ -1,6 +1,28 @@ # ChangeLog for gentoo-vdr-scripts # $Id$ + 08 May 2015; Joerg Bornkessel <hd_brummy@gentoo.org> + usr/share/vdr/shutdown/pre-shutdown-05-time-calculations.sh, + usr/share/vdr/rcscript/pre-start-45-locales.sh, + usr/share/vdr/shutdown/pre-shutdown-90-systohc.sh, Makefile, README.grub2, + README.shutdown-jobs, README.systemd, README.vdrcaps, etc/Makefile, + etc/conf.d/Makefile, etc/init.d/Makefile, etc/init.d/vdr-x11, + etc/sudoers.d/Makefile, etc/systemd/system/vdr.service.d/Makefile, + etc/vdr/Makefile, etc/vdr/commands/Makefile, etc/vdr/reccmds/Makefile, + usr/Makefile, usr/sbin/Makefile, usr/sbin/rtc-wakeup.sh, + usr/share/portage/config/sets/Makefile, usr/share/vdr/Makefile, + usr/share/vdr/bin/Makefile, usr/share/vdr/dvdchanger/Makefile, + usr/share/vdr/dvdchanger/dvdchanger_readdvd.sh, + usr/share/vdr/dvdchanger/dvdchanger_writedvd.sh, usr/share/vdr/inc/Makefile, + usr/share/vdr/inc/commands-functions.sh, usr/share/vdr/inc/rc-functions.sh, + usr/share/vdr/rcscript/Makefile, usr/share/vdr/record/Makefile, + usr/share/vdr/shutdown/Makefile, usr/share/vdr/shutdown/wakeup-none.sh, + usr/share/vdr/shutdown/wakeup-rtc.sh, usr/share/vdr/systemd/Makefile, + var/vdr/tmp/Makefile, vdrplugin-rebuild/Makefile, + vdrplugin-rebuild/vdrplugin-rebuild: + whitespace; moved 'source' to '.' to be POSIX compliant, wrt bug 548550; + add Id tags for better versioning info + *gentoo-vdr-scripts-2.7.1 (02 Mar 2015) 02 Mar 2015; Joerg Bornkessel <hd_brummy@gentoo.org> etc/init.d/vdr, @@ -1,4 +1,4 @@ -# $Id: $ +# $Id$ SHELL = /bin/bash diff --git a/README.grub2 b/README.grub2 index 57e2713..791d830 100644 --- a/README.grub2 +++ b/README.grub2 @@ -1,4 +1,4 @@ -# $Id: $ +# $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 d34f836..3ceeec5 100644 --- a/README.shutdown-jobs +++ b/README.shutdown-jobs @@ -1,4 +1,4 @@ -# $Id: $ +# $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 6fd57a3..9ad1e52 100644 --- a/README.systemd +++ b/README.systemd @@ -1,4 +1,4 @@ -# $Id: $ +# $Id$ Instructions for usage and configuration with systemd diff --git a/README.vdrcaps b/README.vdrcaps index 4364678..32e2e2e 100644 --- a/README.vdrcaps +++ b/README.vdrcaps @@ -1,4 +1,4 @@ -# $Id: $ +# $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/etc/Makefile b/etc/Makefile index 1287d0f..0951bde 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 454 2007-05-30 09:56:54Z zzam $ +# $Id$ SHELL = /bin/bash diff --git a/etc/conf.d/Makefile b/etc/conf.d/Makefile index c57751c..a6608df 100644 --- a/etc/conf.d/Makefile +++ b/etc/conf.d/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 454 2007-05-30 09:56:54Z zzam $ +# $Id$ SHELL = /bin/bash diff --git a/etc/init.d/Makefile b/etc/init.d/Makefile index 307d619..a8933a2 100644 --- a/etc/init.d/Makefile +++ b/etc/init.d/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 454 2007-05-30 09:56:54Z zzam $ +# $Id$ SHELL = /bin/bash diff --git a/etc/init.d/vdr-x11 b/etc/init.d/vdr-x11 index be98d10..2ca211f 100644 --- a/etc/init.d/vdr-x11 +++ b/etc/init.d/vdr-x11 @@ -5,7 +5,7 @@ description="Start minimal X server for VDR" -source /etc/conf.d/vdr +. /etc/conf.d/vdr command="/usr/bin/X" command_args="${X11_SERVER:=\:0 -br -nocursor -nolisten tcp -quiet}" diff --git a/etc/sudoers.d/Makefile b/etc/sudoers.d/Makefile index 9780c6f..dc453d6 100644 --- a/etc/sudoers.d/Makefile +++ b/etc/sudoers.d/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 454 2007-05-30 09:56:54Z zzam $ +# $Id$ SHELL = /bin/bash diff --git a/etc/systemd/system/vdr.service.d/Makefile b/etc/systemd/system/vdr.service.d/Makefile index 9bb7610..3e7256b 100644 --- a/etc/systemd/system/vdr.service.d/Makefile +++ b/etc/systemd/system/vdr.service.d/Makefile @@ -1,4 +1,4 @@ -# $Id: $ +# $Id$ SHELL = /bin/bash diff --git a/etc/vdr/Makefile b/etc/vdr/Makefile index 7a93b2c..9505761 100644 --- a/etc/vdr/Makefile +++ b/etc/vdr/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 454 2007-05-30 09:56:54Z zzam $ +# $Id$ SHELL = /bin/bash diff --git a/etc/vdr/commands/Makefile b/etc/vdr/commands/Makefile index 21055c3..479e963 100644 --- a/etc/vdr/commands/Makefile +++ b/etc/vdr/commands/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 454 2007-05-30 09:56:54Z zzam $ +# $Id$ SHELL = /bin/bash diff --git a/etc/vdr/reccmds/Makefile b/etc/vdr/reccmds/Makefile index 91295fe..ae55c7b 100644 --- a/etc/vdr/reccmds/Makefile +++ b/etc/vdr/reccmds/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 454 2007-05-30 09:56:54Z zzam $ +# $Id$ SHELL = /bin/bash diff --git a/usr/Makefile b/usr/Makefile index 6d79f90..70596fc 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 454 2007-05-30 09:56:54Z zzam $ +# $Id$ SHELL = /bin/bash diff --git a/usr/sbin/Makefile b/usr/sbin/Makefile index 4a17473..f718a61 100644 --- a/usr/sbin/Makefile +++ b/usr/sbin/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 454 2007-05-30 09:56:54Z zzam $ +# $Id$ SHELL = /bin/bash diff --git a/usr/sbin/rtc-wakeup.sh b/usr/sbin/rtc-wakeup.sh index c6bdc16..2978a38 100755 --- a/usr/sbin/rtc-wakeup.sh +++ b/usr/sbin/rtc-wakeup.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: acpi-wakeup.sh 571 2007-12-10 20:50:11Z zzam $ +# $Id$ ## # based on vdrshutdown-acpi.pl diff --git a/usr/share/portage/config/sets/Makefile b/usr/share/portage/config/sets/Makefile index 9557936..9570063 100644 --- a/usr/share/portage/config/sets/Makefile +++ b/usr/share/portage/config/sets/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 454 2007-05-30 09:56:54Z zzam $ +# $Id$ SHELL = /bin/bash diff --git a/usr/share/vdr/Makefile b/usr/share/vdr/Makefile index a045a3e..46943ea 100644 --- a/usr/share/vdr/Makefile +++ b/usr/share/vdr/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 454 2007-05-30 09:56:54Z zzam $ +# $Id$ SHELL = /bin/bash diff --git a/usr/share/vdr/bin/Makefile b/usr/share/vdr/bin/Makefile index 012b76f..ffe96b3 100644 --- a/usr/share/vdr/bin/Makefile +++ b/usr/share/vdr/bin/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 454 2007-05-30 09:56:54Z zzam $ +# $Id$ SHELL = /bin/bash diff --git a/usr/share/vdr/dvdchanger/Makefile b/usr/share/vdr/dvdchanger/Makefile index 30ac4a3..77cdb32 100644 --- a/usr/share/vdr/dvdchanger/Makefile +++ b/usr/share/vdr/dvdchanger/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 454 2007-05-30 09:56:54Z zzam $ +# $Id$ SHELL = /bin/bash diff --git a/usr/share/vdr/dvdchanger/dvdchanger_readdvd.sh b/usr/share/vdr/dvdchanger/dvdchanger_readdvd.sh index adef776..8ed0e9c 100755 --- a/usr/share/vdr/dvdchanger/dvdchanger_readdvd.sh +++ b/usr/share/vdr/dvdchanger/dvdchanger_readdvd.sh @@ -6,7 +6,7 @@ # # an LinVDR angepasst, da LinVDR kein at-Kommando hat # modified for LinVDR, because there is no at-command -# +# # This script will by called by the vdr-plugin dvdselect to copy a DVD to # the local drive. # diff --git a/usr/share/vdr/dvdchanger/dvdchanger_writedvd.sh b/usr/share/vdr/dvdchanger/dvdchanger_writedvd.sh index a759c0a..b6a1433 100755 --- a/usr/share/vdr/dvdchanger/dvdchanger_writedvd.sh +++ b/usr/share/vdr/dvdchanger/dvdchanger_writedvd.sh @@ -16,7 +16,7 @@ if [[ -z ${EXECUTED_BY_VDR_BG} ]]; then exit fi -[[ -e /etc/conf.d/vdr.cd-dvd ]] && source /etc/conf.d/vdr.cd-dvd +[[ -e /etc/conf.d/vdr.cd-dvd ]] && . /etc/conf.d/vdr.cd-dvd ISO_FILE="${1// IMAGE/}" @@ -24,7 +24,7 @@ ISO_FILE="${1// IMAGE/}" : ${VDR_DVDWRITER:=/dev/dvd} -[[ -e /etc/conf.d/vdr.dvdswitch ]] && source /etc/conf.d/vdr.dvdswitch +[[ -e /etc/conf.d/vdr.dvdswitch ]] && . /etc/conf.d/vdr.dvdswitch DVD_RECORDCMD="growisofs" diff --git a/usr/share/vdr/inc/Makefile b/usr/share/vdr/inc/Makefile index 9b38645..3350d9f 100644 --- a/usr/share/vdr/inc/Makefile +++ b/usr/share/vdr/inc/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 454 2007-05-30 09:56:54Z zzam $ +# $Id$ SHELL = /bin/bash diff --git a/usr/share/vdr/inc/commands-functions.sh b/usr/share/vdr/inc/commands-functions.sh index 6ffb479..dcb23c7 100644 --- a/usr/share/vdr/inc/commands-functions.sh +++ b/usr/share/vdr/inc/commands-functions.sh @@ -10,7 +10,7 @@ merge_commands_conf() { local CONFIG="${CONFIG:-/etc/vdr}" local sdir="${1}" destfile="${2}" order="${3}" - + local bname=${destfile##*/} local mergedfile="/var/vdr/merged-config-files/${bname}" diff --git a/usr/share/vdr/inc/rc-functions.sh b/usr/share/vdr/inc/rc-functions.sh index 22abd3c..10b28e9 100644 --- a/usr/share/vdr/inc/rc-functions.sh +++ b/usr/share/vdr/inc/rc-functions.sh @@ -81,7 +81,7 @@ load_addon() { # fallback eval "${func}() { :; }" - + # source addon sh -n "${fname}" || return 1 . "${fname}" || return 1 diff --git a/usr/share/vdr/rcscript/Makefile b/usr/share/vdr/rcscript/Makefile index dcc2319..322e77a 100644 --- a/usr/share/vdr/rcscript/Makefile +++ b/usr/share/vdr/rcscript/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 454 2007-05-30 09:56:54Z zzam $ +# $Id$ SHELL = /bin/bash diff --git a/usr/share/vdr/rcscript/pre-start-45-locales.sh b/usr/share/vdr/rcscript/pre-start-45-locales.sh index 4792df0..6252a3a 100644 --- a/usr/share/vdr/rcscript/pre-start-45-locales.sh +++ b/usr/share/vdr/rcscript/pre-start-45-locales.sh @@ -3,7 +3,7 @@ # disable all locale settings from the system # mostly used to get away from utf8 if vdr does # not support it -source /etc/conf.d/vdr +. /etc/conf.d/vdr unset_all_locale_settings() { local LOCALE_VARS="LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY diff --git a/usr/share/vdr/record/Makefile b/usr/share/vdr/record/Makefile index b8c80e8..3d9b194 100644 --- a/usr/share/vdr/record/Makefile +++ b/usr/share/vdr/record/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 454 2007-05-30 09:56:54Z zzam $ +# $Id$ SHELL = /bin/bash diff --git a/usr/share/vdr/shutdown/Makefile b/usr/share/vdr/shutdown/Makefile index 7b5999c..3b8a703 100644 --- a/usr/share/vdr/shutdown/Makefile +++ b/usr/share/vdr/shutdown/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 454 2007-05-30 09:56:54Z zzam $ +# $Id$ SHELL = /bin/bash 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 2817923..852969b 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,4 @@ -# $Id:$ +# $Id$ : ${FIXED_WAKEUP:=no} : ${FIXED_WAKEUP_TIME:="02:00:00"} diff --git a/usr/share/vdr/shutdown/pre-shutdown-90-systohc.sh b/usr/share/vdr/shutdown/pre-shutdown-90-systohc.sh index 2231b70..5783cb3 100644 --- a/usr/share/vdr/shutdown/pre-shutdown-90-systohc.sh +++ b/usr/share/vdr/shutdown/pre-shutdown-90-systohc.sh @@ -1,4 +1,4 @@ -# $Id: $ +# $Id$ if [ ! -f /etc/init.d/sysfs ]; then # Baselayout 1 diff --git a/usr/share/vdr/shutdown/wakeup-none.sh b/usr/share/vdr/shutdown/wakeup-none.sh index 15aaacb..91ab8b5 100644 --- a/usr/share/vdr/shutdown/wakeup-none.sh +++ b/usr/share/vdr/shutdown/wakeup-none.sh @@ -1,4 +1,4 @@ -# $Id: wakeup-acpi.sh 370 2007-01-04 23:15:45Z zzam $ +# $Id$ # Author: # Matthias Schwarzott <zzam@gmx.de> # Various other contributors from gentoo.de diff --git a/usr/share/vdr/shutdown/wakeup-rtc.sh b/usr/share/vdr/shutdown/wakeup-rtc.sh index 24e4798..3f2021b 100644 --- a/usr/share/vdr/shutdown/wakeup-rtc.sh +++ b/usr/share/vdr/shutdown/wakeup-rtc.sh @@ -1,4 +1,4 @@ -# $Id: wakeup-acpi.sh 571 2007-12-10 20:50:11Z zzam $ +# $Id$ # Author: # Matthias Schwarzott <zzam@gmx.de> # Various other contributors from gentoo.de diff --git a/usr/share/vdr/systemd/Makefile b/usr/share/vdr/systemd/Makefile index 0995b3b..69d1175 100644 --- a/usr/share/vdr/systemd/Makefile +++ b/usr/share/vdr/systemd/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 454 2007-05-30 09:56:54Z zzam $ +# $Id$ SHELL = /bin/bash diff --git a/var/vdr/tmp/Makefile b/var/vdr/tmp/Makefile index 3009af8..2292897 100644 --- a/var/vdr/tmp/Makefile +++ b/var/vdr/tmp/Makefile @@ -1,4 +1,4 @@ -#$Id: $ +#$Id$ SHELL = /bin/bash diff --git a/vdrplugin-rebuild/Makefile b/vdrplugin-rebuild/Makefile index 62da0b9..68b0196 100644 --- a/vdrplugin-rebuild/Makefile +++ b/vdrplugin-rebuild/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 454 2007-05-30 09:56:54Z zzam $ +# $Id$ SHELL = /bin/bash diff --git a/vdrplugin-rebuild/vdrplugin-rebuild b/vdrplugin-rebuild/vdrplugin-rebuild index b5c5dab..42e7bd7 100644 --- a/vdrplugin-rebuild/vdrplugin-rebuild +++ b/vdrplugin-rebuild/vdrplugin-rebuild @@ -84,7 +84,7 @@ db_plug_list() { ebuild="" ebuild_v="" plugins="" - eval $(source "${dbfile}"; echo ebuild=\"${EBUILD}\"; echo ebuild_v=\"${EBUILD_V}\"; echo plugins=\"${PLUGINS}\") + eval $(. "${dbfile}"; echo ebuild=\"${EBUILD}\"; echo ebuild_v=\"${EBUILD_V}\"; echo plugins=\"${PLUGINS}\") auto=1 |