X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fasdf%2Fpull-asdf.sh;h=9aed165d3274ebd0743b92d360166bb647f8165a;hb=5f891793819e3cd714c443c9a0a7223b4fb13dd0;hp=2b5ba427bfb58802e7e8c73f1861a28b67cb0aa1;hpb=5bf941f419b6cd275feb3ee44ca264596fbd9e8e;p=sbcl.git

diff --git a/contrib/asdf/pull-asdf.sh b/contrib/asdf/pull-asdf.sh
index 2b5ba42..9aed165 100644
--- a/contrib/asdf/pull-asdf.sh
+++ b/contrib/asdf/pull-asdf.sh
@@ -1,15 +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 asdf-upstream && make
+cd ../../obj/asdf-upstream && make