Added optional patch from Jhon Kelly.

This commit is contained in:
Manuel Canales Esparcia 2005-09-26 18:07:56 +00:00
parent 557fe91345
commit 4e5e9b41e7

View file

@ -0,0 +1,55 @@
Submitted By: Jhon 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 don't accept - as filename, like the one shipped with
Debian 3.1 stable.
--- jhalfs.orig 2005-09-25 17:17:15.000000000 -0400
+++ jhalfs 2005-09-25 19:12:12.000000000 -0400
@@ -189,9 +189,12 @@
DIR=`echo $1 | sed 's@-doc@@'`
# 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
@@ -203,7 +206,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
@@ -216,8 +219,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
}
--
http://linuxfromscratch.org/mailman/listinfo/alfs-discuss
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page