rpms/vdr/devel vdr-runvdr.sh, 1.3, 1.4 vdr.init, 1.5, 1.6 vdr.spec, 1.19, 1.20

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/vdr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27709

Modified Files:
	vdr-runvdr.sh vdr.init vdr.spec 
Log Message:
* Sun Feb 17 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-9
- Don't run "restart" for init script's "reload" action per the LSB spec.
- runvdr cleanups, handle PLUGIN_ENABLED values case insensitively.



Index: vdr-runvdr.sh
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr-runvdr.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vdr-runvdr.sh	20 Jan 2008 22:07:12 -0000	1.3
+++ vdr-runvdr.sh	17 Feb 2008 20:25:39 -0000	1.4
@@ -4,11 +4,12 @@
 #
 # runvdr [VDROPTION]...
 
-shopt -s nullglob
+shopt -s nocasematch nullglob
 
 VDR=/usr/sbin/vdr
 PLUGINDIR=/usr/lib/vdr
 PLUGINVER=VDR_PLUGIN_VERSION
+PLUGINSUF=${PLUGINVER:+.$PLUGINVER}
 
 prog=$(basename $0)
 log()
@@ -22,8 +23,8 @@
     local plugin="$1" PLUGIN_OPTIONS= PLUGIN_ENABLED=
     if [ -e "/etc/sysconfig/vdr-plugins.d/$plugin.conf" ] ; then
         . "/etc/sysconfig/vdr-plugins.d/$plugin.conf"
+        case "$PLUGIN_ENABLED" in no|false|0) return ;; esac
     fi
-    case "$PLUGIN_ENABLED" in no|false|0) return ;; esac
     VDR_OPTIONS[${#VDR_OPTIONS[@]}]=-P
     if [ -z "$PLUGIN_OPTIONS" ] ; then
         VDR_OPTIONS[${#VDR_OPTIONS[@]}]="$plugin"
@@ -34,26 +35,22 @@
 
 build_cmdline()
 {
-    local file= plugin= p= libsuf=$1
+    local file= plugin= p=
     # Add "priority" plugins.
-    if [ -n "$VDR_PLUGIN_ORDER" ] ; then
-        for plugin in $VDR_PLUGIN_ORDER ; do
-            if [ -e $PLUGINDIR/libvdr-${plugin}.so$libsuf ] ; then
-                plugconf $plugin
+    for plugin in $VDR_PLUGIN_ORDER ; do
+        if [ -e $PLUGINDIR/libvdr-${plugin}.so$PLUGINSUF ] ; then
+            plugconf $plugin
+        fi
+    done
+    # Add the rest available.
+    for file in $PLUGINDIR/libvdr-*.so$PLUGINSUF ; do
+        plugin=$(basename ${file##*/libvdr-} .so$PLUGINSUF)
+        for p in $VDR_PLUGIN_ORDER ; do
+            if [ "$plugin" = "$p" ] ; then
+                # Already added.
+                continue 2
             fi
         done
-    fi
-    # Add the rest available.
-    for file in $PLUGINDIR/libvdr-*.so$libsuf ; do
-        plugin=$(basename $file | sed -e 's/^libvdr-\(.*\)\.so.*$/\1/')
-        if [ -n "$VDR_PLUGIN_ORDER" ] ; then
-            for p in $VDR_PLUGIN_ORDER ; do
-                if [ "$plugin" = "$p" ] ; then
-                    # Already added.
-                    continue 2
-                fi
-            done
-        fi
         plugconf "$plugin"
     done
 }
@@ -77,7 +74,7 @@
             ulimit -S -c $DAEMON_COREFILE_LIMIT >/dev/null 2>&1 && \
                 cd ${TMPDIR:-/tmp}
         fi
-        build_cmdline ${PLUGINVER:+.$PLUGINVER}
+        build_cmdline
     fi
 
     $VDR "$@" "${VDR_OPTIONS[@]}"


Index: vdr.init
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vdr.init	12 Oct 2007 19:00:55 -0000	1.5
+++ vdr.init	17 Feb 2008 20:25:39 -0000	1.6
@@ -79,9 +79,13 @@
     start|stop|restart)
         $1
         ;;
-    reload|force-reload)
+    force-reload)
         restart
         ;;
+    reload)
+        action $"Service $prog does not support the reload action: " /bin/false
+        exit 3
+        ;;
     status)
         status $prog
         ;;
@@ -89,6 +93,6 @@
   	[ ! -f $lockfile ] || restart
 	;;
     *)
-        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
+        echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
         exit 2
 esac


Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- vdr.spec	14 Feb 2008 17:35:08 -0000	1.19
+++ vdr.spec	17 Feb 2008 20:25:39 -0000	1.20
@@ -19,7 +19,7 @@
 
 Name:           vdr
 Version:        1.4.7
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
@@ -451,6 +451,10 @@
 %endif
 
 %changelog
+* Sun Feb 17 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-9
+- Don't run "restart" for init script's "reload" action per the LSB spec.
+- runvdr cleanups, handle PLUGIN_ENABLED values case insensitively.
+
 * Thu Feb 14 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-8
 - Patch to fix build with GCC 4.3's cleaned up C++ headers.