X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=boot;h=18a083e02e92b2d38add0a2107cf72c77680f45a;hp=d554b037bd0714e3c4db702ca55c1b4dcaf65274;hb=72edf508ec424d744376eda2c4191e3c45111bce;hpb=e05f9de137269701df667b69d741dfae616694f7

diff --git a/boot b/boot
index d554b03..18a083e 100644
--- a/boot
+++ b/boot
@@ -2,11 +2,11 @@
 set -e
 
 # Check that we have all boot packages.
-for dir in `cat libraries/boot-packages`
+for dir in `grep "^[^# ][^ ]*  *[^ ][^ ]*  *[^ ][^ ]*$" packages | sed "s/ .*//"`
 do
-    if test ! -d libraries/$dir
+    if test ! -d $dir
     then
-        echo "Looks like you're missing libraries/$dir." >&2
+        echo "Looks like you're missing $dir." >&2
         echo "Maybe you haven't done './darcs-all get'?" >&2
         exit 1
     fi
@@ -25,6 +25,9 @@ done
 # Alas, darcs doesn't handle file permissions, so fix a few of them.
 for f in boot darcs-all push-all validate
 do
-    test -f $f && chmod +x $f
+    if test -f $f
+    then
+        chmod +x $f
+    fi
 done