r1211 - vdr/vdr/trunk/debian

[Thomas Günther]

Author: tom-guest
Date: 2005-09-08 18:37:16 +0000 (Thu, 08 Sep 2005)
New Revision: 1211

Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/plugin-loader.sh
Log:
Fixed vdr call with LD_ASSUME_KERNEL=2.4.1 in plugins-loader.sh

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2005-09-06 15:50:30 UTC (rev 1210)
+++ vdr/vdr/trunk/debian/changelog	2005-09-08 18:37:16 UTC (rev 1211)
@@ -14,6 +14,8 @@
     - Do not try to call vdr with LD_ASSUME_KERNEL=2.4.1 in plugins-loader.sh
       on amd64 (many thanks to Sören Köpping for reporting the problem and
       sending a patch) (closes: #326866)
+  * Thomas Günther <tom at toms-cafe.de>
+    - Fixed vdr call with LD_ASSUME_KERNEL=2.4.1 in plugins-loader.sh
 
  -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Tue,  6 Sep 2005 14:19:43 +0200
 

Modified: vdr/vdr/trunk/debian/plugin-loader.sh
===================================================================
--- vdr/vdr/trunk/debian/plugin-loader.sh	2005-09-06 15:50:30 UTC (rev 1210)
+++ vdr/vdr/trunk/debian/plugin-loader.sh	2005-09-08 18:37:16 UTC (rev 1211)
@@ -17,19 +17,19 @@
     local vdrcmd
     local version
 
+    vdrcmd="/usr/bin/vdr -u $USER -g $GROUP $OPTIONS"
+
     if [ "$NONPTL" = "1" -a `uname -m` != x86_64 ]; then
-        vdrcmd="LD_ASSUME_KERNEL=2.4.1 /usr/bin/vdr"
-    else
-        vdrcmd="/usr/bin/vdr"
+        vdrcmd="LD_ASSUME_KERNEL=2.4.1 $vdrcmd"
     fi
 
-    version=`$vdrcmd -u $USER -g $GROUP -V -L/usr/bin/vdr 2>/dev/null | sed -e 's/.*(\(.*\)).*/\1/'`
+    version=`eval "$vdrcmd -V -L/usr/bin/vdr 2>/dev/null | sed 's/.*(\(.*\)).*/\1/'"`
     test "$version" || version="unknown version"
- 
+
     PLUGINS=""
- 
+
     echo -ne "\nSearching for plugins (VDR $version):"
- 
+
     # find installed plugins
     installed_plugins=( `find $PLUGIN_DIR -maxdepth 1 -name "$PLUGIN_PREFIX*.so.$version" -printf "%f " | sed "s/$PLUGIN_PREFIX\([^\.]\+\)\.so\.$version/\1/g"` )
 
@@ -54,7 +54,7 @@
 
         # move not startable plugins to $leftout2
         for (( i=${#installed_plugins[@]}, i-- ; i >= 0 ; i-- )); do
-            if ! $vdrcmd -u $USER -g $GROUP $OPTIONS -V -L $PLUGIN_DIR -P ${installed_plugins[$i]} \
+            if ! eval "$vdrcmd -V -L $PLUGIN_DIR -P ${installed_plugins[$i]}" \
                 2>/dev/null | grep -q "^${installed_plugins[$i]} "; then
                 leftout2="${leftout2} ${installed_plugins[$i]}"
                 unset installed_plugins[$i]