r2387 - jhalfs/branches/experimental/common

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Wed Mar 22 06:15:22 PST 2006


Author: georgeb
Date: 2006-03-22 07:15:22 -0700 (Wed, 22 Mar 2006)
New Revision: 2387

Modified:
   jhalfs/branches/experimental/common/common-functions
   jhalfs/branches/experimental/common/config
Log:
Change package download functions back to HTTP until the FTP mirror rotation problems solved

Modified: jhalfs/branches/experimental/common/common-functions
===================================================================
--- jhalfs/branches/experimental/common/common-functions	2006-03-21 23:25:40 UTC (rev 2386)
+++ jhalfs/branches/experimental/common/common-functions	2006-03-22 14:15:22 UTC (rev 2387)
@@ -783,13 +783,15 @@
 
   if [ ! -f $2 ] ; then
     case $DL in
-      wget )  wget --passive $FTP/$DIR/$2            ;;
+      wgetFTP )  wget --passive $FTP/$DIR/$2            ;;
+      wget )  wget $HTTP/$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 --passive -c $FTP/$DIR/$2         ;;
+      wgetFTP )  wget --passive -c $FTP/$DIR/$2         ;;
+      wget )   wget -c $HTTP/$DIR/$2            ;;
       curl )  `curl -# -C - $FTP/$DIR/$2 -o $2`    ;;
       * )     echo "$DL not supported at this time."  ;;
     esac

Modified: jhalfs/branches/experimental/common/config
===================================================================
--- jhalfs/branches/experimental/common/config	2006-03-21 23:25:40 UTC (rev 2386)
+++ jhalfs/branches/experimental/common/config	2006-03-22 14:15:22 UTC (rev 2387)
@@ -7,6 +7,7 @@
 
 declare -r SVN="svn://svn.linuxfromscratch.org"
 declare -r LOG=000-masterscript.log
+declare -r HTTP=http://ftp.lfs-matrix.net/pub/lfs/conglomeration
 
 #--- Mount point for the build
 BUILDDIR=/mnt/SourceFiles




More information about the alfs-log mailing list