===================================================================
RCS file: /home/cvs/OpenXM/src/util/oxfetch.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- OpenXM/src/util/oxfetch.sh	2003/11/14 02:58:20	1.1
+++ OpenXM/src/util/oxfetch.sh	2003/11/16 17:17:02	1.2
@@ -1,14 +1,14 @@
 #!/bin/sh
-# $OpenXM$
+# $OpenXM: OpenXM/src/util/oxfetch.sh,v 1.1 2003/11/14 02:58:20 ohara Exp $
 
 fetch="wget --no-directories --passive-ftp --quiet --timestamping"
 url=$1
 distdir=${2:-.}
-md5file=$3
+distinfo=$3
 distfile=`basename "$url"`
 
 _usage () {
-    echo 'usage: oxfetch URL [savedir] [md5file]'
+    echo 'usage: oxfetch URL [savedir] [distinfo]'
     exit 1
 }
 
@@ -24,15 +24,22 @@ _fetch () {
     fi
 }
 
+# usage: cat distinfo | _md5 gc6.2.tar.gz
+_md5 () {
+    if [ $# -gt 0 ]; then
+        grep "^MD5 ($1) =" | sed -e "s/^MD5 ($1) = //"
+    fi
+}
+
 _check () {
-    if [ -f "$md5file" ]; then
-        (cd $distdir; md5 "$distfile" > "md5.$distfile" )
-        if cmp "$distdir/md5.$distfile" "$md5file" ; then
+    if [ -f "$distinfo" ]; then
+        key1=`(cd $distdir; md5 "$distfile" ) | _md5 $distfile`
+        key2=`cat $distinfo | _md5 "$distfile"`
+        if [ "$key1" = "$key2" ] ; then
             echo "Checksum OK for $distfile".
         else
             echo "Checksum mismatch for $distfile".
         fi
-        rm -f "$distdir/md5.$distfile"
     fi
 }