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

Fixed a few bugs (I think)

Browse source
This commit is contained in:
Manuel Canales Esparcia 2006-05-01 21:20:29 +00:00
parent aa901e7463
commit 19528f8976
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
common/common-functions
View file

@ -487,8 +487,8 @@ get_book() {
# sources. # sources.
if [ -d ${PROGNAME}-$LFSVRS ] ; then if [ -d ${PROGNAME}-$LFSVRS ] ; then
cd ${PROGNAME}-$LFSVRS cd ${PROGNAME}-$LFSVRS
if LC_ALL=C svn up | grep -q At && test -d $JHALFSDIR/commands && \ if LC_ALL=C svn up | grep -q At && test -d $JHALFSDIR/${PROGNAME}-commands && \
test -f $JHALFSDIR/packages && test -f $JHALFSDIR/patches ; then test -f $JHALFSDIR/packages ; then
echo -ne "done\n" echo -ne "done\n"
# Set the canonical book version # Set the canonical book version
cd $JHALFSDIR cd $JHALFSDIR
@ -632,7 +632,7 @@ extract_commands() { #
get_sources() { # Download file, write name to MISSING_FILES.DMP if an error get_sources() { # Download file, write name to MISSING_FILES.DMP if an error
#----------------------------# #----------------------------#
local saveIFS=$IFS local saveIFS=$IFS
local IFS line URL1 URL2 FILE MD5 local IFS line URL1 URL2 FILE MD5 NOMD5
# Test if the packages must be downloaded # Test if the packages must be downloaded
if [ "$GETPKG" = "1" ] ; then if [ "$GETPKG" = "1" ] ; then
@ -674,7 +674,7 @@ get_sources() { # Download file, write name to MISSING_FILES.DMP if
[ -d ${SRC_ARCHIVE} ] && [ -d ${SRC_ARCHIVE} ] &&
[ -f ${SRC_ARCHIVE}/$FILE ]; then [ -f ${SRC_ARCHIVE}/$FILE ]; then
cp ${SRC_ARCHIVE}/$FILE . cp ${SRC_ARCHIVE}/$FILE .
echo "$FILE: -- copied from $SRC_ARCHIVE" echo "$FILE: -- copied from $SRC_ARCHIVE" && continue
fi fi
# Find the md5 sum for this package. # Find the md5 sum for this package.
@ -684,16 +684,21 @@ get_sources() { # Download file, write name to MISSING_FILES.DMP if
set -e set -e
echo "${RED}$FILE not found in MD5SUMS${OFF}" echo "${RED}$FILE not found in MD5SUMS${OFF}"
echo "$FILE not found in MD5SUMS" >> MISSING_FILES.DMP echo "$FILE not found in MD5SUMS" >> MISSING_FILES.DMP
NOMD5=1
fi fi
set -e set -e
if [ ! -f $FILE ] ; then if [ ! -f $FILE ] ; then
wget $URL1 || wget $URL2 wget $URL1 || wget $URL2 || \
elif ! echo "$MD5" | md5sum -c - >/dev/null 2>/dev/null ; then echo "${RED}$FILE not found on the servers${OFF}"
wget -N $URL1 || wget -N $URL2 echo "$FILE not found on the servers" >> MISSING_FILES.DMP
elif [[ "$NOMD5" != "1" ]] && ! echo "$MD5" | md5sum -c - ; then
wget -N $URL1 || wget -N $URL2 || \
echo "${RED}$FILE not found on the servers${OFF}"
echo "$FILE not found on the servers" >> MISSING_FILES.DMP
fi fi
if ! echo "$MD5" | md5sum -c - ; then if [[ "$NOMD5" != "1" ]] && ! echo "$MD5" | md5sum -c - ; then
echo "${RED}$FILE not match MD5SUMS value${OFF}" echo "${RED}$FILE not match MD5SUMS value${OFF}"
echo "$FILE not match MD5SUMS value" >> MISSING_FILES.DMP echo "$FILE not match MD5SUMS value" >> MISSING_FILES.DMP
fi fi