r2300 - in jhalfs/trunk: . HLFS

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Fri Mar 3 12:58:08 PST 2006


Author: jhuntwork
Date: 2006-03-03 13:58:07 -0700 (Fri, 03 Mar 2006)
New Revision: 2300

Modified:
   jhalfs/trunk/HLFS/jhahlfs
   jhalfs/trunk/HLFS/jhahlfs.conf
   jhalfs/trunk/jhalfs
   jhalfs/trunk/jhalfs-0.2-debian_31_as_host-1.patch
   jhalfs/trunk/jhalfs.conf
Log:
Set scripts to use ftp mirrors instead of a specific http mirror for downloads

Modified: jhalfs/trunk/HLFS/jhahlfs
===================================================================
--- jhalfs/trunk/HLFS/jhahlfs	2006-03-03 01:38:30 UTC (rev 2299)
+++ jhalfs/trunk/HLFS/jhahlfs	2006-03-03 20:58:07 UTC (rev 2300)
@@ -524,14 +524,14 @@
 
   if [ ! -f $2 ] ; then
     case $DL in
-      wget )  wget $HTTP/$DIR/$2            ;;
-      curl )  `curl -# $HTTP/$DIR/$2 -o $2`     ;;
+      wget )  wget --passive $FTP/$DIR/$2            ;;
+      curl )  `curl -# $FTP/$DIR/$2 -o $2`     ;;
       * )     echo "$DL not supported at this time."  ;;
     esac
   elif ! echo "$MD5" | md5sum -c - >/dev/null 2>/dev/null ; then
     case $DL in
-      wget )  wget -c $HTTP/$DIR/$2         ;;
-      curl )  `curl -# -C - $HTTP/$DIR/$2 -o $2`    ;;
+      wget )  wget --passive -c $FTP/$DIR/$2         ;;
+      curl )  `curl -# -C - $FTP/$DIR/$2 -o $2`    ;;
       * )     echo "$DL not supported at this time."  ;;
     esac
   fi

Modified: jhalfs/trunk/HLFS/jhahlfs.conf
===================================================================
--- jhalfs/trunk/HLFS/jhahlfs.conf	2006-03-03 01:38:30 UTC (rev 2299)
+++ jhalfs/trunk/HLFS/jhahlfs.conf	2006-03-03 20:58:07 UTC (rev 2300)
@@ -5,7 +5,7 @@
 #####
 
 declare -r SVN="svn://svn.linuxfromscratch.org"
-declare -r HTTP=http://ftp.lfs-matrix.net/pub/lfs/conglomeration
+declare -r FTP=http://ftp.linuxfromscratch.org/pub/lfs/conglomeration
 declare -r LOG=000-jhahlfs.log
 
 #--- Mount point for the build

Modified: jhalfs/trunk/jhalfs
===================================================================
--- jhalfs/trunk/jhalfs	2006-03-03 01:38:30 UTC (rev 2299)
+++ jhalfs/trunk/jhalfs	2006-03-03 20:58:07 UTC (rev 2300)
@@ -258,10 +258,10 @@
   if [ ! -f $2 ] ; then
     case $DL in
       wget )
-        wget $HTTP/$DIR/$2
+        wget --passive $FTP/$DIR/$2
         ;;
       curl )
-        `curl -# $HTTP/$DIR/$2 -o $2`
+        `curl -# $FTP/$DIR/$2 -o $2`
         ;;
       * )
         echo "$DL not supported at this time."
@@ -270,10 +270,10 @@
   elif ! echo "$MD5" | md5sum -c - >/dev/null 2>/dev/null ; then
     case $DL in
       wget )
-        wget -c $HTTP/$DIR/$2
+        wget --passive -c $FTP/$DIR/$2
         ;;
       curl )
-        `curl -# -C - $HTTP/$DIR/$2 -o $2`
+        `curl -# -C - $FTP/$DIR/$2 -o $2`
         ;;
       * )
         echo "$DL not supported at this time."

Modified: jhalfs/trunk/jhalfs-0.2-debian_31_as_host-1.patch
===================================================================
--- jhalfs/trunk/jhalfs-0.2-debian_31_as_host-1.patch	2006-03-03 01:38:30 UTC (rev 2299)
+++ jhalfs/trunk/jhalfs-0.2-debian_31_as_host-1.patch	2006-03-03 20:58:07 UTC (rev 2300)
@@ -23,7 +23,7 @@
 +  if [ ! -f $2 -o $2 == MD5SUMS ] ; then
      case $DL in
        wget )
-         wget $HTTP/$DIR/$2
+         wget $FTP/$DIR/$2
 @@ -274,7 +277,7 @@
          echo "$DL not supported at this time."
          ;;
@@ -32,7 +32,7 @@
 +  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
+         wget -c $FTP/$DIR/$2
 @@ -287,8 +290,11 @@
          ;;
      esac

Modified: jhalfs/trunk/jhalfs.conf
===================================================================
--- jhalfs/trunk/jhalfs.conf	2006-03-03 01:38:30 UTC (rev 2299)
+++ jhalfs/trunk/jhalfs.conf	2006-03-03 20:58:07 UTC (rev 2300)
@@ -5,7 +5,7 @@
 #####
 
 declare -r SVN="svn://svn.linuxfromscratch.org"
-declare -r HTTP=http://ftp.lfs-matrix.net/pub/lfs/conglomeration
+declare -r FTP=ftp://ftp.linuxfromscratch.org/pub/lfs/conglomeration
 declare -r LOG=000-jhalfs.log
 
 #--- Mount point for the build




More information about the alfs-log mailing list