Retain simplifications of implication constraints

[ghc-hetmet.git] / darcs-all

diff --git a/darcs-all b/darcs-all
index 186771e..1ab395b 100644 (file)
--- a/darcs-all
+++ b/darcs-all
@@ -4,11 +4,15 @@ set -e
 
 top_dirs="nofib testsuite"
 
-default_repo_root="http://darcs.haskell.org/ghc-6.6/"
-default_lib_repo_root=$default_repo_root/packages
-
-default_extra_repo_root="http://darcs.haskell.org/"
-default_extra_lib_repo_root=$default_extra_repo_root/packages
+# Figure out where to get the other repositories from,
+# based on where this GHC repo came from.
+defaultrepo=`cat _darcs/prefs/defaultrepo`
+case $defaultrepo in
+  http://*) default_repo_root=`echo $defaultrepo | sed 's!/ghc$!!'`
+            default_lib_repo_root=$default_repo_root/packages;;
+  /*)       default_repo_root=$defaultrepo
+            default_lib_repo_root=$default_repo_root/libraries;;
+esac
 
 quiet=NO
 
@@ -56,27 +60,21 @@ darcsget()
 
   cd libraries
 
-  for pkg in `cat core-packages`; do
-    if test -d $pkg; then
-       echo "warning: $pkg already present; omitting"
-    else
-       repo=$lib_repos/$pkg
-       message "== running darcs get --partial $* $repo"
-       darcs get --partial $* $repo
-    fi
-  done
-
   if test "$extra" = "YES"; then
-  for pkg in `cat extra-packages`; do
+      packages=`cat core-packages extra-packages`
+  else
+      packages=`cat core-packages`
+  fi
+
+  for pkg in $packages; do
     if test -d $pkg; then
        echo "warning: $pkg already present; omitting"
     else
-       repo=$default_extra_lib_repo_root/$pkg
+       repo=$lib_repos/$pkg
        message "== running darcs get --partial $* $repo"
        darcs get --partial $* $repo
     fi
   done
-  fi
 }
 
 if test ! -d _darcs -o ! -d compiler; then