vdr/vdr/debian changelog plugin-loader.sh vdr.init
Thomas Schmidt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Sat, 07 Aug 2004 11:33:01 +0000
Update of /cvsroot/pkg-vdr-dvb/vdr/vdr/debian
In directory haydn:/tmp/cvs-serv23056/vdr/vdr/debian
Modified Files:
changelog plugin-loader.sh vdr.init
Log Message:
revert changes for #264081, they seem to break plugin-loading with arguments here
Index: changelog
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/changelog,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- changelog 7 Aug 2004 10:39:12 -0000 1.40
+++ changelog 7 Aug 2004 11:32:59 -0000 1.41
@@ -25,8 +25,6 @@
gcc 3.4 (Closes: #262744)
- Changed $PLUGIN_CFG_DIR in /etc/default/vdr, to /etc/vdr/plugins
(Closes: #264071)
- - Changed vdr.init and plugin-loader.sh as suggested by Darren Salt
- (Closes: #264081)
-- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Sun, 07 Aug 2004 12:36:33 +0200
Index: plugin-loader.sh
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/plugin-loader.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- plugin-loader.sh 7 Aug 2004 10:39:12 -0000 1.9
+++ plugin-loader.sh 7 Aug 2004 11:32:59 -0000 1.10
@@ -4,7 +4,7 @@
VERSION=`/usr/bin/vdr -V 2>/dev/null | grep '^vdr[- ]' | sed -e 's/.*(\(.*\)).*/\1/'`
-PLUGINS=()
+PLUGINS=""
getplugins ()
{
@@ -67,16 +67,14 @@
ordered_plugins=( "${ordered_plugins[@]}" "${installed_plugins[@]}" )
# add the command line arguments for each plugin
- i=0
for plugin in ${ordered_plugins[@]}; do
echo -n " $plugin"
if [ -r "$PLUGIN_CFG_DIR/plugin.$plugin.conf" ] ; then
arguments=( `cat $PLUGIN_CFG_DIR/plugin.$plugin.conf | sed "s/#.*$//"` )
- PLUGINS[$i]="-P $plugin ${arguments[*]}"
+ PLUGINS="$PLUGINS -P \"$plugin ${arguments[*]}\""
else
- PLUGINS[$i]="-P $plugin"
+ PLUGINS="$PLUGINS -P $plugin"
fi
- i=$(($i+1))
done
# warn about incompatible plugins
Index: vdr.init
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.init,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- vdr.init 7 Aug 2004 10:39:12 -0000 1.25
+++ vdr.init 7 Aug 2004 11:32:59 -0000 1.26
@@ -29,7 +29,7 @@
mergecommands "reccmds"
start-stop-daemon --start --quiet \
--exec /usr/sbin/runvdr -- -v $VIDEO_DIR -c $CFG_DIR -r $REC_CMD \
- -s $SHUTDOWN_CMD $OPTIONS "${PLUGINS[@]}" &
+ -s $SHUTDOWN_CMD $OPTIONS $PLUGINS &
else
echo -n " - seems to be running already"
fi