r6757 - in /vdr/vdr/trunk/debian: changelog plugin-loader.sh

[tom-guest at users.alioth.debian.org]

Author: tom-guest
Date: Sat Apr 19 21:06:23 2008
New Revision: 6757

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=6757
Log:
Improved caching in plugin-loader.sh

Modified:
    vdr/vdr/trunk/debian/changelog
    vdr/vdr/trunk/debian/plugin-loader.sh

Modified: vdr/vdr/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/changelog?rev=6757&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/changelog (original)
+++ vdr/vdr/trunk/debian/changelog Sat Apr 19 21:06:23 2008
@@ -28,6 +28,7 @@
   [ Thomas Günther ]
   * Upgraded make-special-vdr.sh to version 0.9
   * Upgraded opt-41-x_timer-info.dpatch to version 0.5
+  * Improved caching in plugin-loader.sh
 
  -- Tobias Grimm <tg at e-tobi.net>  Sat, 12 Apr 2008 23:24:29 +0200
 

Modified: vdr/vdr/trunk/debian/plugin-loader.sh
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/plugin-loader.sh?rev=6757&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/plugin-loader.sh (original)
+++ vdr/vdr/trunk/debian/plugin-loader.sh Sat Apr 19 21:06:23 2008
@@ -36,7 +36,7 @@
     # cached plugin index up to date ?
     if [ -e ${CACHE_MD5} ] && \
        [ -e ${CACHE_FILE} ] && \
-       md5sum ${PLUGIN_DIR}/*.so.* ${CACHE_FILE} | diff -q ${CACHE_MD5} /dev/stdin 1>/dev/null
+       md5sum ${PLUGIN_DIR}/${PLUGIN_PREFIX}*.so.${version} ${CACHE_FILE} 2>&1 | cmp -s - ${CACHE_MD5}
     then
         plugins=`cat ${CACHE_FILE}`
         echo -ne "(cache hit):"
@@ -51,7 +51,7 @@
                    sed "s/:.*${PLUGIN_PREFIX}\([^\.]\+\)\.so\.${version}.*$/:\1/"`)
         # write results into cache
         echo ${plugins[@]} > ${CACHE_FILE}
-        md5sum ${PLUGIN_DIR}/*.so.* ${CACHE_FILE} > ${CACHE_MD5}
+        md5sum ${PLUGIN_DIR}/${PLUGIN_PREFIX}*.so.${version} ${CACHE_FILE} > ${CACHE_MD5} 2>&1
     fi
     installed_plugins=(`echo ${plugins[@]} | sed 's/[^ ]*://g'`)
     packages=(   vdr   `echo ${plugins[@]} | sed 's/:[^ ]*//g'`)