X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=darcs-all;h=69e0ff9406be1f4f6d1ab5d6f37c294aa41f7744;hp=186771ee41a24cbf2152990d8203bd7f26811bd6;hb=b88025eabcd83f65d1d81f09272f5172f06a60e7;hpb=e291c4cef087ba1afa6d0ff026fb37b55b209e74

diff --git a/darcs-all b/darcs-all
index 186771e..69e0ff9 100644
--- 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://* | *@*:*)
+    defaultrepo_lib=`echo $defaultrepo | sed 's!/ghc$!!'`/packages;;
+  /*)
+    defaultrepo_lib=$defaultrepo/libraries;;
+esac
 
 quiet=NO
 
@@ -44,39 +48,30 @@ darcsall()
 darcsget()
 {
   case $* in
-    *--partial*) ;;
-    *) echo "warning: adding --partial, to override use --complete"
-  esac
-
-  repo_root=`cat _darcs/prefs/defaultrepo`
-  case $repo_root in
-    /*) lib_repos=$repo_root/libraries;;
-    *)  lib_repos=$default_lib_repo_root;;
+    *--complete*|*--partial*)
+      additional_flag="" ;;
+    *)
+      echo "warning: adding --partial, to override use --complete"
+      additional_flag="--partial" ;;
   esac
 
   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
-	message "== running darcs get --partial $* $repo"
-	darcs get --partial $* $repo
+	repo=$defaultrepo_lib/$pkg
+	message "== running darcs get $additional_flag $* $repo"
+	darcs get $additional_flag $* $repo
     fi
   done
-  fi
 }
 
 if test ! -d _darcs -o ! -d compiler; then