diff options
| author |   Joerg Bornkessel <hd_brummy@gentoo.org> | 2013-01-26 10:38:13 +0100 |
|---|---|---|
| committer | Joerg Bornkessel <hd_brummy@gentoo.org> | 2013-01-26 10:38:13 +0100 |
| commit | e939207dbc1f11d136943b6efa109aad1dd52ece (patch) | |
| tree | 151339bf5f06afb4d6b23a0a775d1ebed3870e2e /usr | |
| parent | Bumped to version 0.5.3 (diff) | |
| download | gentoo-vdr-scripts-e939207dbc1f11d136943b6efa109aad1dd52ece.tar.gz gentoo-vdr-scripts-e939207dbc1f11d136943b6efa109aad1dd52ece.tar.bz2 gentoo-vdr-scripts-e939207dbc1f11d136943b6efa109aad1dd52ece.zip | |
support chachedir; removed svdrp port 2001; removed --rcu support
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/share/vdr/rcscript/post-start-50-svdrp.sh | 8 | ||||
| -rw-r--r-- | usr/share/vdr/rcscript/pre-start-30-parameter.sh | 15 |
2 files changed, 11 insertions, 12 deletions
diff --git a/usr/share/vdr/rcscript/post-start-50-svdrp.sh b/usr/share/vdr/rcscript/post-start-50-svdrp.sh index e64cc9f..c21588e 100644 --- a/usr/share/vdr/rcscript/post-start-50-svdrp.sh +++ b/usr/share/vdr/rcscript/post-start-50-svdrp.sh @@ -9,12 +9,12 @@ addon_main() { # we already know vdr failed [ "${vdr_start_failed}" = "1" ] && return 0 - if [ "${VDRVERSNUM}" -ge "10715" ]; then +# if [ "${VDRVERSNUM}" -ge "10715" ]; then SVDRP_PORT="${SVDRP_PORT:-6419}" logger -t vdr "New default svdrp port 6419!" - else - SVDRP_PORT="${SVDRP_PORT:-2001}" - fi +# else +# SVDRP_PORT="${SVDRP_PORT:-2001}" +# fi SVDRP_HOSTNAME="${SVDRP_HOSTNAME:-localhost}" [ "${SVDRP_PORT}" = "0" ] && 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 623e404..a142ace 100644 --- a/usr/share/vdr/rcscript/pre-start-30-parameter.sh +++ b/usr/share/vdr/rcscript/pre-start-30-parameter.sh @@ -12,7 +12,8 @@ addon_main() { yesno "${MUTE}" && add_param "--mute" [ -n "${CONFIG}" ] && add_param "--config=${CONFIG}" [ -n "${DEVICE}" ] && for i in ${DEVICE}; do add_param "--device=${i}"; done - [ -n "${EPGFILE}" ] && add_param "--epgfile=${EPGFILE}" + add_param "--epgfile=${EPGFILE:--E-}" + add_param "--cachedir=${CACHEDIR:-/var/cache/vdr}" add_param "--log=${LOG:-1}" [ -z "${VIDEO}" ] && VIDEO="/var/vdr/video" if [ ! -d "${VIDEO}" ]; then @@ -34,13 +35,11 @@ addon_main() { add_param "--lirc=/dev/lircd" fi ;; - rcu) if [ "${VDRVERSNUM}" -ge "10725" ]; then - eerror "rcu parameter is depricated" - eerror "use media-plugins/vdr-rcu" - else - add_param "--rcu" - fi - ;; + rcu) eerror "rcu parameter is obsolete" + eerror "use media-plugins/vdr-rcu" + logger -t vdr "rcu parameter is obsolete" + logger -t vdr "use media-plugins/vdr-rcu" + ;; esac fi |