From 316b8d79e57d07b3e89e1163197beec2d062c241 Mon Sep 17 00:00:00 2001
From: Jeremy Huntwork <jhuntwork@linuxfromscratch.org>
Date: Sun, 13 Nov 2005 01:44:10 +0000
Subject: [PATCH] Merged revisions 2175, 2176 to branches/0.2

---
 jhalfs      | 6 +++++-
 jhalfs.conf | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/jhalfs b/jhalfs
index 6b59422..4a97c2b 100755
--- a/jhalfs
+++ b/jhalfs
@@ -196,7 +196,7 @@ download() {
   # Hackish fix for the bash-doc, glibc-{linuxthreads,libidn} and
   # module-init-tools-testsuite packages that doesn't conform to 
   # norms in the URL scheme.
-  DIR=`echo $1 | sed 's@-doc@@' -e 's@-linuxthreads@@' -e 's@-libidn@@' -e 's@-testsuite@@'`
+  DIR=`echo $1 | sed 's@-doc@@;s@-linuxthreads@@;s@-libidn@@;s@-testsuite@@'`
 
   # Find the md5 sum for this package.
   if [ $2 != MD5SUMS ] ; then MD5=`grep "  $2" MD5SUMS` ; fi
@@ -875,6 +875,10 @@ while test $# -gt 0 ; do
         testing | 6.1.1 )
           LFSVRS=6.1.1
           ;;
+	
+	alpha*)
+	  LFSVRS=alphabetical
+	  ;;
         * )
           echo "$1 is an unsupported version at this time."
           exit 1
diff --git a/jhalfs.conf b/jhalfs.conf
index e7289dc..e33bb88 100644
--- a/jhalfs.conf
+++ b/jhalfs.conf
@@ -5,7 +5,7 @@
 #####
 
 declare -r SVN="svn://svn.linuxfromscratch.org"
-declare -r HTTP=http://ftp.lfs-matrix.net/pub/lfs/lfs-packages/conglomeration
+declare -r HTTP=http://ftp.lfs-matrix.net/pub/lfs/conglomeration
 declare -r XSL=dump-lfs-scripts.xsl
 declare -r LOG=000-jhalfs.log