49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
Submitted By: John Kelly (jakelly at shtc dot net)
|
|
Date: 2005-09-26
|
|
Initial Package Version: 0.2
|
|
Origin: alfs-discuss
|
|
Upstream Status: Optional
|
|
Description: Allow jhalfs to work with a md5sum program
|
|
that doesn't accept '-' as a filename, like the one shipped with
|
|
Debian 3.1 stable.
|
|
|
|
--- jhalfs.orig 2005-11-01 07:10:00.104763416 -0500
|
|
+++ jhalfs 2005-11-01 07:10:02.472416413 -0500
|
|
@@ -192,9 +192,12 @@
|
|
DIR=`echo $1 | sed -e 's@-doc@@' -e 's@-linuxthreads@@' -e 's@-libidn@@'`
|
|
|
|
# Find the md5 sum for this package.
|
|
- if [ $2 != MD5SUMS ] ; then MD5=`grep " $2" MD5SUMS` ; fi
|
|
+ if [ $2 != MD5SUMS ] ; then
|
|
+ MD5=$(grep " $2" MD5SUMS | sed -r -e 's/^[[:blank:]]+//;s/[[:blank:]]+$//;s/[[:blank:]]+/ /g')
|
|
+ md5_file=${MD5#* } ; md5_chksum=${MD5% *}
|
|
+ fi
|
|
|
|
- if [ ! -f $2 ] ; then
|
|
+ if [ ! -f $2 -o $2 == MD5SUMS ] ; then
|
|
case $DL in
|
|
wget )
|
|
wget $HTTP/$DIR/$2
|
|
@@ -206,7 +209,7 @@
|
|
echo "$DL not supported at this time."
|
|
;;
|
|
esac
|
|
- elif ! echo "$MD5" | md5sum -c - >/dev/null 2>/dev/null ; then
|
|
+ elif [ "$md5_chksum" != "$(md5sum $md5_file | sed -r -e 's/^[[:blank:]]+//;s/[[:blank:]]+$//;s/[[:blank:]]+/\t/g' | cut -f 1)" ] ; then
|
|
case $DL in
|
|
wget )
|
|
wget -c $HTTP/$DIR/$2
|
|
@@ -219,8 +222,11 @@
|
|
;;
|
|
esac
|
|
fi
|
|
- if [ $2 != MD5SUMS ] && ! echo "$MD5" | md5sum -c - ; then
|
|
- exit 1
|
|
+ if [ $2 != MD5SUMS ] ; then
|
|
+ if [ "$md5_chksum" != "$(md5sum $md5_file | sed -r -e 's/^[[:blank:]]+//;s/[[:blank:]]+$//;s/[[:blank:]]+/\t/g' | cut -f 1)" ] ; then
|
|
+ echo "$2 md5 checksum does not match $md5_chksum"
|
|
+ exit 1
|
|
+ fi
|
|
fi
|
|
}
|
|
|