zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Simplified download code.

Browse source 
Now the MD5 sum values are set in the books.
This commit is contained in:
Manuel Canales Esparcia 2006-05-13 11:26:19 +00:00
parent 046d5c320f
commit 8a43b5b6cf
1 changed files with 19 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
common/common-functions
View file

@ -659,13 +659,9 @@ get_sources() { # Download file, write name to MISSING_FILES.DMP if
[[ ! -d $BUILDDIR/sources ]] && mkdir $BUILDDIR/sources [[ ! -d $BUILDDIR/sources ]] && mkdir $BUILDDIR/sources
cd $BUILDDIR/sources cd $BUILDDIR/sources
[[ -f MD5SUMS ]] && rm MD5SUMS [[ -f MD5SUMS ]] && rm MD5SUMS
[[ -f MD5SUMS-$VERSION ]] && rm MD5SUMS-$VERSION
[[ -f MISSING_FILES.DMP ]] && rm MISSING_FILES.DMP [[ -f MISSING_FILES.DMP ]] && rm MISSING_FILES.DMP
[[ -f urls.lst ]] && rm urls.lst [[ -f urls.lst ]] && rm urls.lst
# Download a fresh MD5SUMS file
wget $SERVER/pub/lfs/conglomeration/MD5SUMS
# Generate URLs file # Generate URLs file
create_urls create_urls
@ -689,21 +685,9 @@ get_sources() { # Download file, write name to MISSING_FILES.DMP if
FILE=`basename $URL1` # File name FILE=`basename $URL1` # File name
BOOKMD5=`echo $line | cut -d" " -f3` # MD5 book value BOOKMD5=`echo $line | cut -d" " -f3` # MD5 book value
if [[ x"$BOOKMD5" != "x" ]]; then # Validation pair
HAVEMD5=1 MD5="$BOOKMD5 $FILE"
MD5="$BOOKMD5 $FILE" HAVEMD5=1
else
# Find the md5 sum for this package in the server MD5SUMS file.
set +e
HAVEMD5=1 # Always assume we have a MD5SUM
MD5=`grep " $FILE" MD5SUMS`
if [ $? -ne 0 ]; then
set -e
gs_wrt_message "$FILE not found in MD5SUMS"
# IMPORTANT:: There is no MD5SUM for this file.
HAVEMD5=0
fi
fi
set -e set -e
# If the file exists in the archive copy it to the # If the file exists in the archive copy it to the
@ -717,7 +701,7 @@ get_sources() { # Download file, write name to MISSING_FILES.DMP if
else else
echo "${BOLD}${YELLOW}$FILE: not found in ${SRC_ARCHIVE}${OFF}" echo "${BOLD}${YELLOW}$FILE: not found in ${SRC_ARCHIVE}${OFF}"
fromARCHIVE=0 fromARCHIVE=0
# If the file does not exist in /sources download a fresh one # If the file does not exist yet in /sources download a fresh one
if [ ! -f $FILE ] ; then if [ ! -f $FILE ] ; then
if ! wget $URL1 && ! wget $URL2 ; then if ! wget $URL1 && ! wget $URL2 ; then
gs_wrt_message "$FILE not found in the SRC_ARCHIVE or on any server..SKIPPING" gs_wrt_message "$FILE not found in the SRC_ARCHIVE or on any server..SKIPPING"
@ -726,26 +710,23 @@ get_sources() { # Download file, write name to MISSING_FILES.DMP if
fi fi
fi fi
# Is there a MD5SUM to validate the file against. # IF the md5sum does not match the existing files
if [[ "$HAVEMD5" = "1" ]] ; then if ! echo "$MD5" | md5sum -c - >/dev/null ; then
# IF the md5sum does not match the existing files [[ $fromARCHIVE = "1" ]] && echo "${BOLD}${YELLOW}MD5SUM did not match SRC_ARCHIVE copy${OFF}"
if ! echo "$MD5" | md5sum -c - >/dev/null ; then [[ $fromARCHIVE = "0" ]] && echo "${BOLD}${YELLOW}MD5SUM did not match REMOTE copy${OFF}"
[[ $fromARCHIVE = "1" ]] && echo "${BOLD}${YELLOW}MD5SUM did not match SRC_ARCHIVE copy${OFF}" # Remove the old file and download a new one
[[ $fromARCHIVE = "0" ]] && echo "${BOLD}${YELLOW}MD5SUM did not match REMOTE copy${OFF}" rm -fv $FILE
# Remove the old file and download a new one # Force storage in SRC_ARCHIVE
rm -fv $FILE fromARCHIVE=0;
# Force generation of MD5SUM and storage in SRC_ARCHIVE # Try to retrieve again the file. Servers in reverse order.
fromARCHIVE=0; if ! wget $URL2 && ! wget $URL1 ; then
# Try and retrieve the file. Servers in reverse order. gs_wrt_message "$FILE not found on the servers.. SKIPPING"
if ! wget $URL2 && ! wget $URL1 ; then continue
gs_wrt_message "$FILE not found on the servers.. SKIPPING"
continue
fi
fi fi
fi fi
# Validate the MD5SUM one last time # Validate the MD5SUM one last time
if [[ "$HAVEMD5" = "1" ]] && ! echo "$MD5" | md5sum -c - >/dev/null ; then if ! echo "$MD5" | md5sum -c - >/dev/null ; then
gs_wrt_message "$FILE does not match MD5SUMS value" gs_wrt_message "$FILE does not match MD5SUMS value"
# Force generation of MD5SUM # Force generation of MD5SUM
HAVEMD5=0 HAVEMD5=0
@ -754,11 +735,11 @@ get_sources() { # Download file, write name to MISSING_FILES.DMP if
# Generate a fresh MD5SUM for this file # Generate a fresh MD5SUM for this file
if [[ "$HAVEMD5" = "0" ]] ; then if [[ "$HAVEMD5" = "0" ]] ; then
echo "${BOLD}${YELLOW}Generating a new MD5SUM for ${OFF}$FILE" echo "${BOLD}${YELLOW}Generating a new MD5SUM for ${OFF}$FILE"
echo "NEW MD5SUM $(md5sum $FILE)" >> MISSING_FILES.DMP echo "NEW MD5SUM: $(md5sum $FILE)" >> MISSING_FILES.DMP
fi fi
# Good or bad we write the original md5sum to a file # Good or bad we write the original md5sum to a file
echo "$MD5" >> MD5SUMS-$VERSION echo "$MD5" >> MD5SUMS
# Copy the freshly downloaded file # Copy the freshly downloaded file
# to the source archive. # to the source archive.