X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fasdf%2Fpull-asdf.sh;fp=contrib%2Fasdf%2Fpull-asdf.sh;h=9aed165d3274ebd0743b92d360166bb647f8165a;hb=25c1769e30ff7404b52a9be663626d87f8ff75bc;hp=35f56691bf2563d095b66e37a1d9b931ab01405b;hpb=9c3a9502bc872f024c365412d991ef43fd866e4c;p=sbcl.git

diff --git a/contrib/asdf/pull-asdf.sh b/contrib/asdf/pull-asdf.sh
index 35f5669..9aed165 100644
--- a/contrib/asdf/pull-asdf.sh
+++ b/contrib/asdf/pull-asdf.sh
@@ -1,13 +1,26 @@
-#!/bin/sh
+#!/bin/sh -e
 
 # Get the current ASDF release from the upstream repo.
 
 if test -d asdf-upstream
 then
-    cd asdf-upstream
+    if test -d ../../obj/asdf-upstream
+    then
+        rm -rf asdf-upstream
+    else
+        mv asdf-upstream ../../obj/asdf-upstream
+    fi
+fi
+
+if test -d ../../obj/asdf-upstream
+then
+    (cd ../../obj/asdf-upstream/
     git checkout release
     git reset --hard release
-    git pull -a
+    git pull -a origin release)
 else
-    git clone --branch release git://common-lisp.net/projects/asdf/asdf.git asdf-upstream
+    (cd ../../obj/
+    git clone --branch release git://common-lisp.net/projects/asdf/asdf.git asdf-upstream)
 fi
+
+cd ../../obj/asdf-upstream && make