Changeset 19528f8 for common/common-functions

Timestamp:

05/01/2006 09:20:29 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

8de111f

Parents:

aa901e7

Message:

Fixed a few bugs (I think)

File:

• common/common-functions (modified) (4 diffs)

common/common-functions

@@ -488 +488 @@
     if [ -d ${PROGNAME}-$LFSVRS ] ; then
       cd ${PROGNAME}-$LFSVRS
-      if LC_ALL=C svn up | grep -q At && test -d $JHALFSDIR/commands && \
-      test -f $JHALFSDIR/packages && test -f $JHALFSDIR/patches ; then
+      if LC_ALL=C svn up | grep -q At && test -d $JHALFSDIR/${PROGNAME}-commands && \
+      test -f $JHALFSDIR/packages ; then
         echo -ne "done\n"
         # Set the canonical book version
@@ -633 +633 @@
 #----------------------------#
   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
@@ -675 +675 @@
          [ -f ${SRC_ARCHIVE}/$FILE ]; then
         cp ${SRC_ARCHIVE}/$FILE .
-        echo "$FILE: -- copied from $SRC_ARCHIVE"
+        echo "$FILE: -- copied from $SRC_ARCHIVE" && continue
       fi
 
@@ -685 +685 @@
         echo "${RED}$FILE not found in MD5SUMS${OFF}"
         echo "$FILE not found in MD5SUMS" >> MISSING_FILES.DMP
+        NOMD5=1
       fi
       set -e
 
       if [ ! -f $FILE ] ; then
-        wget $URL1 || wget $URL2
-      elif ! echo "$MD5" | md5sum -c - >/dev/null 2>/dev/null ; then
-        wget -N $URL1 || wget -N $URL2
+        wget $URL1 || wget $URL2 || \
+        echo "${RED}$FILE not found on the servers${OFF}"
+        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
 
-      if ! echo "$MD5" | md5sum -c - ; then
+      if [[ "$NOMD5" != "1" ]] && ! echo "$MD5" | md5sum -c - ; then
         echo "${RED}$FILE not match MD5SUMS value${OFF}"
         echo "$FILE not match MD5SUMS value" >> MISSING_FILES.DMP