support chachedir; removed svdrp port 2001; removed --rcu support

4 files changed, 32 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 1de9c98..caf105f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gentoo-vdr-scripts
 # $Id$
 
+  26 Jan 2013; Joerg Bornkessel <hd_brummy@gentoo.org>
+  usr/share/vdr/rcscript/pre-start-30-parameter.sh,
+  usr/share/vdr/rcscript/post-start-50-svdrp.sh, etc/conf.d/vdr:
+  added --cachedir to support the new vdr FHS handling,
+  removed support for svdrp 2001 port,
+  removed --rcu support, use media-plugins/vdr-rcu
+
 *gentoo-vdr-scripts-0.5.3 (07 Oct 2012)
 
   07 Oct 2012; Joerg Bornkessel <hd_brummy@gentoo.org> etc/conf.d/vdr.shutdown,
diff --git a/etc/conf.d/vdr b/etc/conf.d/vdr
index 1d94ace..37670ce 100644
--- a/etc/conf.d/vdr
+++ b/etc/conf.d/vdr
@@ -147,12 +147,20 @@ LOG="3"
 #   default: /etc/vdr
 #CONFIG="/etc/vdr"
 
+# write/read cached vdr files in the given directory
+# e.g. epg.data
+#    allowed values: directory names
+#    default: /var/cache/vdr
+#CACHEDIR="/var/cache/vdr"
+
+# VDR write the EPG default in the CACHEDIR
+# overwrite this with following (no good idea)
 # write the EPG data into the given FILE; use '-E-' to disable this
 # if FILE is a directory, the default EPG file will be
 # created in that directory
-#   allowed values: file/directory names, -E- to disable
-#   default: $VIDEO/epg.data
-#EPGFILE="/var/vdr/epg.data"
+#   allowed values: -E-, file/directory names
+#   default: -E-
+#EPGFILE="-E-"
 
 # activate the (internal to vdr) watchdog timer with
 # a timeout of SEC seconds (recommended by Klaus Schmidinger)
@@ -172,11 +180,11 @@ LOG="3"
 #            (up to vdr-1.3.36-r2: use what was selected by use-flag)
 #VFAT_FILENAMES="yes"
 
-# use PORT for SVDRP (default: 2001) (>=vdr-1.7.15 default: 6419)
+# use PORT for SVDRP (default: 6419)
 # 0 turns off SVDRP
 #   allowed values: numbers for ports between 1024 and 65535
-#   default: 2001 / 6419
-#SVDRP_PORT="2001"
+#   default: 6419
+#SVDRP_PORT="6419"
 
 # seconds to wait for a running vdr
 #   allowed values: numbers
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