Changeset 261eea6 for common/common-functions

Timestamp:

05/03/2006 09:34:13 AM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

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

Children:

afa32da

Parents:

26d25e8

Message:

clean up some cosmetic errors

File:

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

common/common-functions

@@ -246 +246 @@
 
 
-#=============================#
-wrt_unpack3() {               #
-#=============================#
+#----------------------------------#
+wrt_unpack3() {                    #
+#----------------------------------#
   local FILE=$1
 (
@@ -302 +302 @@
 
 
-#=============================#
-wrt_run_as_root2() {          #
-#=============================#
+#----------------------------------#
+wrt_run_as_root2() {               #
+#----------------------------------#
   local this_script=$1
   local file=$2
@@ -401 +401 @@
 
 #----------------------------------#
-wrt_report() {         #
+wrt_report() {                     #
 #----------------------------------#
 (
@@ -419 +419 @@
 
 #----------------------------#
-run_make() {
+run_make() {                 #
 #----------------------------#
   # Test if make must be run.
@@ -439 +439 @@
 
 #----------------------------#
-clean_builddir() {
+clean_builddir() {           #
 #----------------------------#
   # Test if the clean must be done.
@@ -466 +466 @@
 
 #----------------------------#
-get_book() {
+get_book() {                 #
 #----------------------------#
   cd $JHALFSDIR
@@ -680 +680 @@
     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
+      set -e
+      gs_wrt_message "$FILE not found in MD5SUMS"
+        # IMPORTANT:: There is no MD5SUM for this file.
+      HAVEMD5=0
     fi
 
@@ -701 +701 @@
       if [ ! -f $FILE ] ; then
         if ! wget $URL1 && ! wget $URL2 ; then
-          gs_wrt_message "$FILE not found in the SRC_ARCHIVE or on any server..SKIPPING" 
-          continue 
+          gs_wrt_message "$FILE not found in the SRC_ARCHIVE or on any server..SKIPPING" 
+          continue 
         fi
       fi
@@ -711 +711 @@
         # IF the md5sum does not match the existing files
       if ! echo "$MD5" | md5sum -c - >/dev/null ; then
-        [[ $fromARCHIVE = "1" ]] && echo "${BOLD}${YELLOW}MD5SUM did not match SRC_ARCHIVE copy${OFF}"
-        [[ $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}"
+        [[ $fromARCHIVE = "0" ]] && echo "${BOLD}${YELLOW}MD5SUM did not match REMOTE copy${OFF}"
           # Remove the old file and download a new one
-        rm -fv $FILE
-          # Force generation of MD5SUM and storage in SRC_ARCHIVE 
+        rm -fv $FILE
+          # Force generation of MD5SUM and storage in SRC_ARCHIVE 
         fromARCHIVE=0; HAVEMD5=0
-          # Try and retrieve the file
-          # I swap server priority to allow for corruption on the primary site
+          # Try and retrieve the file
         if ! wget -N $URL1 && ! wget -N $URL2 ; then
-          gs_wrt_message "$FILE not found on the servers.. SKIPPING"
-          continue
-        fi
+          gs_wrt_message "$FILE not found on the servers.. SKIPPING"
+          continue
+        fi
       fi
     fi
@@ -755 +754 @@
     echo  -e "\n\n${tab_}${RED} One or more files were not retrieved or have a bad MD5SUMS chechsum.\n${tab_} Check ${L_arrow}$BUILDDIR/sources/MISSING_FILES.DMP${R_arrow} for names ${OFF}\n"
       # Do not allow the automatic exection of the Makefile.
-    echo     "${tab_}${BOLD}${RED}*** ${YELLOW}Automatic execution of the generated makefile has been inhibited. ${RED}***${OFF}${nl_}"
+    echo "${tab_}${BOLD}${RED}*** ${YELLOW}Automatic execution of the generated makefile has been inhibited. ${RED}***${OFF}${nl_}"
     RUNMAKE=0
   fi