Fixed uninitialised FunBind fun_tick field

[ghc-hetmet.git] / darcs-all

diff --git a/darcs-all b/darcs-all
index 1ab395b..69e0ff9 100644 (file)
--- a/darcs-all
+++ b/darcs-all
@@ -8,10 +8,10 @@ top_dirs="nofib testsuite"
 # 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;;
+  http://* | *@*:*)
+    defaultrepo_lib=`echo $defaultrepo | sed 's!/ghc$!!'`/packages;;
+  /*)
+    defaultrepo_lib=$defaultrepo/libraries;;
 esac
 
 quiet=NO
@@ -48,14 +48,11 @@ 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
@@ -70,9 +67,9 @@ darcsget()
     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
+       repo=$defaultrepo_lib/$pkg
+       message "== running darcs get $additional_flag $* $repo"
+       darcs get $additional_flag $* $repo
     fi
   done
 }