From e42f81ee21d170d2d780e2ccfe18a906cb2ce5b4 Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Tue, 17 Apr 2007 09:48:04 +0000 Subject: [PATCH] Removed bash specific stuff. Package-Manager: portage-2.1.2.4 --- media-plugins/vdr-dvd/ChangeLog | 5 ++++- media-plugins/vdr-dvd/files/rc-addon.sh | 10 ++-------- media-plugins/vdr-dvdswitch/ChangeLog | 7 +++++-- media-plugins/vdr-dvdswitch/files/rc-addon.sh | 6 ------ media-plugins/vdr-ffnetdev/ChangeLog | 5 ++++- media-plugins/vdr-ffnetdev/files/rc-addon.sh | 13 ++++--------- media-plugins/vdr-image/ChangeLog | 5 ++++- media-plugins/vdr-image/files/rc-addon.sh | 11 +++-------- media-plugins/vdr-powermate/ChangeLog | 7 +++++-- media-plugins/vdr-powermate/files/rc-addon.sh | 16 ++++++---------- media-plugins/vdr-vcd/ChangeLog | 7 +++++-- media-plugins/vdr-vcd/files/rc-addon.sh | 7 +------ media-plugins/vdr-vdrcd/ChangeLog | 5 ++++- media-plugins/vdr-vdrcd/files/rc-addon.sh | 8 +------- media-plugins/vdr-weatherng/ChangeLog | 6 +++++- .../vdr-weatherng/files/rc-addon-0.0.8.sh | 6 +----- media-plugins/vdr-weatherng/files/rc-addon.sh | 10 +++------- 17 files changed, 57 insertions(+), 77 deletions(-) diff --git a/media-plugins/vdr-dvd/ChangeLog b/media-plugins/vdr-dvd/ChangeLog index e20acf951d86..c9b3493e9b9e 100644 --- a/media-plugins/vdr-dvd/ChangeLog +++ b/media-plugins/vdr-dvd/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-plugins/vdr-dvd # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvd/ChangeLog,v 1.9 2007/03/13 12:43:22 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvd/ChangeLog,v 1.10 2007/04/17 09:45:04 zzam Exp $ + + 17 Apr 2007; Matthias Schwarzott files/rc-addon.sh: + Removed bash specific stuff. 13 Mar 2007; Matthias Schwarzott vdr-dvd-0.3.7_pre20070117.ebuild: diff --git a/media-plugins/vdr-dvd/files/rc-addon.sh b/media-plugins/vdr-dvd/files/rc-addon.sh index 1572038e8b38..ba3d43a131ef 100644 --- a/media-plugins/vdr-dvd/files/rc-addon.sh +++ b/media-plugins/vdr-dvd/files/rc-addon.sh @@ -1,4 +1,4 @@ -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvd/files/rc-addon.sh,v 1.1 2005/12/22 20:39:11 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvd/files/rc-addon.sh,v 1.2 2007/04/17 09:45:04 zzam Exp $ # # rc-addon plugin-startup-skript for vdr-dvd # @@ -10,14 +10,8 @@ plugin_pre_vdr_start() { add_plugin_param "-C${DVD_DRIVE}" - if [[ ${DVD_DVDCSS:=no} == "yes" ]]; then + if [ "${DVD_DVDCSS:=no}" = "yes" ]; then export DVDCSS_METHOD=key fi } - - -# for compatibility -if [[ ${SCRIPT_API:-1} -lt 2 ]]; then - plugin_pre_vdr_start -fi diff --git a/media-plugins/vdr-dvdswitch/ChangeLog b/media-plugins/vdr-dvdswitch/ChangeLog index 0f7e61a1bdaf..113620e697dc 100644 --- a/media-plugins/vdr-dvdswitch/ChangeLog +++ b/media-plugins/vdr-dvdswitch/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-plugins/vdr-dvdswitch -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvdswitch/ChangeLog,v 1.10 2006/11/02 15:51:47 zzam Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvdswitch/ChangeLog,v 1.11 2007/04/17 09:46:42 zzam Exp $ + + 17 Apr 2007; Matthias Schwarzott files/rc-addon.sh: + Removed bash specific stuff. 02 Nov 2006; Matthias Schwarzott -vdr-dvdswitch-0.1.2.ebuild: diff --git a/media-plugins/vdr-dvdswitch/files/rc-addon.sh b/media-plugins/vdr-dvdswitch/files/rc-addon.sh index 83b49ff2c791..eac9333c36dc 100644 --- a/media-plugins/vdr-dvdswitch/files/rc-addon.sh +++ b/media-plugins/vdr-dvdswitch/files/rc-addon.sh @@ -9,9 +9,3 @@ plugin_pre_vdr_start() { add_plugin_param "-r ${DVDSWITCH_READ_DVD}" add_plugin_param "-w ${DVDSWITCH_WRITE_DVD}" } - -# for compatibility -if [[ ${SCRIPT_API:-1} -lt 2 ]]; then - plugin_pre_vdr_start -fi - \ No newline at end of file diff --git a/media-plugins/vdr-ffnetdev/ChangeLog b/media-plugins/vdr-ffnetdev/ChangeLog index 516ca416fbb7..67058dcd1cb7 100644 --- a/media-plugins/vdr-ffnetdev/ChangeLog +++ b/media-plugins/vdr-ffnetdev/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-plugins/vdr-ffnetdev # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ffnetdev/ChangeLog,v 1.7 2007/02/17 01:18:30 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ffnetdev/ChangeLog,v 1.8 2007/04/17 09:46:20 zzam Exp $ + + 17 Apr 2007; Matthias Schwarzott files/rc-addon.sh: + Removed bash specific stuff. 17 Feb 2007; Matthias Schwarzott vdr-ffnetdev-0.1.0.ebuild: diff --git a/media-plugins/vdr-ffnetdev/files/rc-addon.sh b/media-plugins/vdr-ffnetdev/files/rc-addon.sh index a14a9766c1b6..98ef31b5cf12 100644 --- a/media-plugins/vdr-ffnetdev/files/rc-addon.sh +++ b/media-plugins/vdr-ffnetdev/files/rc-addon.sh @@ -1,4 +1,4 @@ -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ffnetdev/files/rc-addon.sh,v 1.1 2006/04/02 15:50:28 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ffnetdev/files/rc-addon.sh,v 1.2 2007/04/17 09:46:20 zzam Exp $ # # rc-addon-script for plugin ffnetdev # @@ -9,14 +9,9 @@ plugin_pre_vdr_start() { - [[ ${USE_VNC} == "yes" ]] && add_plugin_param "-o ${VNC_PORT}" + [ "${USE_VNC}" = "yes" ] && add_plugin_param "-o ${VNC_PORT}" - [[ ${USE_TS} == "yes" ]] && add_plugin_param "-t ${TS_PORT}" + [ "${USE_TS}" = "yes" ] && add_plugin_param "-t ${TS_PORT}" - [[ ${REMOTE} == "yes" ]] && add_plugin_param "-e" + [ "${REMOTE}" = "yes" ] && add_plugin_param "-e" } - -# for compatibility -if [[ ${SCRIPT_API:-1} -lt 2 ]]; then - plugin_pre_vdr_start -fi \ No newline at end of file diff --git a/media-plugins/vdr-image/ChangeLog b/media-plugins/vdr-image/ChangeLog index 223c5c12ca9e..02da8e7c2058 100644 --- a/media-plugins/vdr-image/ChangeLog +++ b/media-plugins/vdr-image/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-plugins/vdr-image # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.17 2007/01/05 16:34:10 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.18 2007/04/17 09:45:24 zzam Exp $ + + 17 Apr 2007; Matthias Schwarzott files/rc-addon.sh: + Removed bash specific stuff. 05 Jan 2007; Joerg Bornkessel vdr-image-0.2.4.ebuild, vdr-image-0.2.6-r1.ebuild, vdr-image-0.2.7.ebuild: diff --git a/media-plugins/vdr-image/files/rc-addon.sh b/media-plugins/vdr-image/files/rc-addon.sh index 108c776830ab..a70848daf0d0 100644 --- a/media-plugins/vdr-image/files/rc-addon.sh +++ b/media-plugins/vdr-image/files/rc-addon.sh @@ -1,4 +1,4 @@ -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/files/rc-addon.sh,v 1.3 2006/07/01 20:49:08 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/files/rc-addon.sh,v 1.4 2007/04/17 09:45:24 zzam Exp $ # # rc-addon plugin-startup-skript for vdr-image # @@ -10,8 +10,8 @@ plugin_pre_vdr_start() { add_plugin_param "-m ${IMAGE_MOUNT}" add_plugin_param "-C ${IMAGE_CONVERT}" - if [[ -f /usr/lib/vdr/inc/commands-functions.sh ]]; then - source /usr/lib/vdr/inc/commands-functions.sh + if [ -f /usr/lib/vdr/inc/commands-functions.sh ]; then + . /usr/lib/vdr/inc/commands-functions.sh else #source /usr/share/vdr/inc/functions.sh include commands-functions @@ -19,8 +19,3 @@ plugin_pre_vdr_start() { merge_commands_conf /etc/vdr/imagecmds /etc/vdr/plugins/image/imagecmds.conf "${ORDER_IMAGECMDS}" } - -if [[ ${SCRIPT_API:-1} -lt 2 ]]; then - plugin_pre_vdr_start -fi - diff --git a/media-plugins/vdr-powermate/ChangeLog b/media-plugins/vdr-powermate/ChangeLog index 824e63cdb75b..a0243e6fd4c2 100644 --- a/media-plugins/vdr-powermate/ChangeLog +++ b/media-plugins/vdr-powermate/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-plugins/vdr-powermate -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-powermate/ChangeLog,v 1.6 2006/12/03 15:01:31 zzam Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-powermate/ChangeLog,v 1.7 2007/04/17 09:48:01 zzam Exp $ + + 17 Apr 2007; Matthias Schwarzott files/rc-addon.sh: + Removed bash specific stuff. 03 Dec 2006; Matthias Schwarzott +files/vdr-powermate-0.0.3-uint64.diff, vdr-powermate-0.0.3.ebuild: diff --git a/media-plugins/vdr-powermate/files/rc-addon.sh b/media-plugins/vdr-powermate/files/rc-addon.sh index eb431626ed89..472174733bf2 100755 --- a/media-plugins/vdr-powermate/files/rc-addon.sh +++ b/media-plugins/vdr-powermate/files/rc-addon.sh @@ -1,5 +1,5 @@ # plugin-startup-skript for powermate-plugin -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-powermate/files/rc-addon.sh,v 1.1 2005/12/13 20:59:06 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-powermate/files/rc-addon.sh,v 1.2 2007/04/17 09:48:01 zzam Exp $ # try to autodetect device for powermate @@ -13,16 +13,16 @@ detect_powermate() { for devfile in /dev/input/event*; do # check if devile is device - [[ -c "${devfile}" ]] || continue + [ -c "${devfile}" ] || continue # and for corresponding sysfs-entry base=${devfile/\/dev\/input\//} sysfile=/sys/class/input/${base}/device/driver - [[ -L "${sysfile}" ]] || continue + [ -L "${sysfile}" ] || continue # if driver-link contains powermate linkdest=$(readlink ${sysfile}) - [[ "${linkdest}" != "${linkdest/powermate/}" ]] || continue + [ "${linkdest}" != "${linkdest#*powermate}" ] || continue # the we are done POWERMATE_DEVICE="${devfile}" @@ -31,11 +31,11 @@ detect_powermate() { } plugin_pre_vdr_start() { - if [[ "${POWERMATE_DEVICE:-auto}" == "auto" ]]; then + if [ "${POWERMATE_DEVICE:-auto}" = "auto" ]; then detect_powermate fi - if [[ -c "${POWERMATE_DEVICE}" ]]; then + if [ -c "${POWERMATE_DEVICE}" ]; then chown vdr:vdr "${POWERMATE_DEVICE}" add_plugin_param "--device=${POWERMATE_DEVICE}" else @@ -43,7 +43,3 @@ plugin_pre_vdr_start() { fi } -# for compatibility -if [[ ${SCRIPT_API:-1} -lt 2 ]]; then - plugin_pre_vdr_start -fi diff --git a/media-plugins/vdr-vcd/ChangeLog b/media-plugins/vdr-vcd/ChangeLog index 7e5fce2ac7ee..fbf948579afe 100644 --- a/media-plugins/vdr-vcd/ChangeLog +++ b/media-plugins/vdr-vcd/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-plugins/vdr-vcd -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vcd/ChangeLog,v 1.4 2006/08/15 09:52:35 zzam Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vcd/ChangeLog,v 1.5 2007/04/17 09:44:24 zzam Exp $ + + 17 Apr 2007; Matthias Schwarzott files/rc-addon.sh: + Removed bash specific stuff. 15 Aug 2006; Matthias Schwarzott metadata.xml: Assigned to Gentoo VDR Project. diff --git a/media-plugins/vdr-vcd/files/rc-addon.sh b/media-plugins/vdr-vcd/files/rc-addon.sh index ecc8f8761490..ba0bcca6e041 100755 --- a/media-plugins/vdr-vcd/files/rc-addon.sh +++ b/media-plugins/vdr-vcd/files/rc-addon.sh @@ -1,13 +1,8 @@ # plugin-startup-skript for vcd-plugin plugin_pre_vdr_start() { - [[ -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 : ${VDR_CDREADER:=/dev/cdrom} : ${VCD_DEVICE:=${VDR_CDREADER}} add_plugin_param "--vcd ${VCD_DEVICE}" } - -# for compatibility -if [[ ${SCRIPT_API:-1} -lt 2 ]]; then - plugin_pre_vdr_start -fi diff --git a/media-plugins/vdr-vdrcd/ChangeLog b/media-plugins/vdr-vdrcd/ChangeLog index ea4fc379f97b..6b21b18c9b25 100644 --- a/media-plugins/vdr-vdrcd/ChangeLog +++ b/media-plugins/vdr-vdrcd/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-plugins/vdr-vdrcd # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vdrcd/ChangeLog,v 1.5 2007/01/05 16:59:00 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vdrcd/ChangeLog,v 1.6 2007/04/17 09:48:04 zzam Exp $ + + 17 Apr 2007; Matthias Schwarzott files/rc-addon.sh: + Removed bash specific stuff. 05 Jan 2007; Joerg Bornkessel vdr-vdrcd-0.0.10.1-r1.ebuild: diff --git a/media-plugins/vdr-vdrcd/files/rc-addon.sh b/media-plugins/vdr-vdrcd/files/rc-addon.sh index b17e39fd15a4..83116c3e738b 100644 --- a/media-plugins/vdr-vdrcd/files/rc-addon.sh +++ b/media-plugins/vdr-vdrcd/files/rc-addon.sh @@ -1,4 +1,4 @@ -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vdrcd/files/rc-addon.sh,v 1.1 2006/01/29 21:36:07 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vdrcd/files/rc-addon.sh,v 1.2 2007/04/17 09:48:04 zzam Exp $ # # rc-addon plugin-startup-skript for vdr-vdrcd # @@ -17,9 +17,3 @@ plugin_pre_vdr_start() { add_plugin_param "-m ${VDRCD_PLUGIN_MOUNT}" } - - -# for compatibility - if [[ ${SCRIPT_API:-1} -lt 2 ]]; then - plugin_pre_vdr_start - fi diff --git a/media-plugins/vdr-weatherng/ChangeLog b/media-plugins/vdr-weatherng/ChangeLog index 51b834d1ada1..96ae71d9972f 100644 --- a/media-plugins/vdr-weatherng/ChangeLog +++ b/media-plugins/vdr-weatherng/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-weatherng # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-weatherng/ChangeLog,v 1.14 2007/04/05 20:02:46 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-weatherng/ChangeLog,v 1.15 2007/04/17 09:43:15 zzam Exp $ + + 17 Apr 2007; Matthias Schwarzott + files/rc-addon-0.0.8.sh, files/rc-addon.sh: + Removed bash specific stuff. 05 Apr 2007; Joerg Bornkessel vdr-weatherng-0.0.8_pre3.ebuild: diff --git a/media-plugins/vdr-weatherng/files/rc-addon-0.0.8.sh b/media-plugins/vdr-weatherng/files/rc-addon-0.0.8.sh index 14d63a425875..adf3a3b9334a 100644 --- a/media-plugins/vdr-weatherng/files/rc-addon-0.0.8.sh +++ b/media-plugins/vdr-weatherng/files/rc-addon-0.0.8.sh @@ -1,4 +1,4 @@ -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-weatherng/files/rc-addon-0.0.8.sh,v 1.1 2006/03/18 16:44:06 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-weatherng/files/rc-addon-0.0.8.sh,v 1.2 2007/04/17 09:43:15 zzam Exp $ # # rc-addon-script for plugin weatherng # @@ -22,7 +22,3 @@ plugin_pre_vdr_start() { add_plugin_param "-S ${WEATHERNG_BIN_DIR}" } -# for compatibility -if [[ ${SCRIPT_API:-1} -lt 2 ]]; then - plugin_pre_vdr_start -fi diff --git a/media-plugins/vdr-weatherng/files/rc-addon.sh b/media-plugins/vdr-weatherng/files/rc-addon.sh index 518cbe9b4a66..c3fdb8f720a9 100644 --- a/media-plugins/vdr-weatherng/files/rc-addon.sh +++ b/media-plugins/vdr-weatherng/files/rc-addon.sh @@ -1,17 +1,13 @@ -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-weatherng/files/rc-addon.sh,v 1.1 2006/03/07 23:27:21 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-weatherng/files/rc-addon.sh,v 1.2 2007/04/17 09:43:15 zzam Exp $ # # rc-addon-script for plugin weatherng # plugin_pre_vdr_start() { - [[ -z "${WEATHERNG_IMAGE_DIR}" ]] && WEATHERNG_IMAGE_DIR="/usr/share/vdr/weatherng" + [ -z "${WEATHERNG_IMAGE_DIR}" ] && WEATHERNG_IMAGE_DIR="/usr/share/vdr/weatherng" add_plugin_param "-I ${WEATHERNG_IMAGE_DIR}" - [[ -z "${WEATHERNG_DATA_DIR}" ]] && WEATHERNG_DATA_DIR="/var/vdr/weatherng" + [ -z "${WEATHERNG_DATA_DIR}" ] && WEATHERNG_DATA_DIR="/var/vdr/weatherng" add_plugin_param "-D ${WEATHERNG_DATA_DIR}" } -# for compatibility -if [[ ${SCRIPT_API:-1} -lt 2 ]]; then - plugin_pre_vdr_start -fi -- 2.26.2