X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=boot-pkgs;h=017705b62c68504feceeb5197d23d0bd140fc789;hb=6eb7886a38836b8a6d7445d2003271b4e2125034;hp=31ad53c5166e989669bff62ab02ad31a7bd1a86c;hpb=91cb5af24ad12cd5574b4cca84ec9fb97668dceb;p=ghc-hetmet.git

diff --git a/boot-pkgs b/boot-pkgs
index 31ad53c..017705b 100644
--- a/boot-pkgs
+++ b/boot-pkgs
@@ -3,7 +3,9 @@ set -e
 
 libraries=
 
-tarred=`ls -1 libraries/tarballs | sed "s/-[0-9.]*\(-snapshot\)\{0,1\}.tar.gz//"`
+# We do the sed in 3 steps, as the -snapshot may or may not be there,
+# and I can't see a way to optionally match it with POSIX BREs
+tarred=`ls -1 libraries/tarballs | sed -e 's/\.tar\.gz$//' -e 's/-snapshot$//' -e 's/-[0-9.]*$//'`
 
 for p in $tarred
 do
@@ -22,7 +24,7 @@ do
             mkdir "libraries/$p"
             (
                 cd "libraries/$p"
-                tar -zxf ../../$tarball
+                cat ../../$tarball | gzip -d | tar xf -
                 mv */* .
             )
             touch "$stamp"