[armedbear-cvs] r14261 - trunk/abcl/contrib/quicklisp

[mevenson at common-lisp.net]

Author: mevenson
Date: Wed Nov 28 10:48:10 2012
New Revision: 14261

Log:
abcl-contrib> QUICKLISP-ABCL now installs Quicklisp from the REPL.

Use via

    (dolist (system (:abcl-contrib :quicklisp-abcl)) (require system))

Modified:
   trunk/abcl/contrib/quicklisp/quicklisp-abcl.asd

Modified: trunk/abcl/contrib/quicklisp/quicklisp-abcl.asd
==============================================================================
--- trunk/abcl/contrib/quicklisp/quicklisp-abcl.asd	Wed Nov 28 06:35:49 2012	(r14260)
+++ trunk/abcl/contrib/quicklisp/quicklisp-abcl.asd	Wed Nov 28 10:48:10 2012	(r14261)
@@ -19,9 +19,15 @@
                                          (user-homedir-pathname))))
     (if (probe-file quicklisp-init)
         (load quicklisp-init)
-        (progn
-          (load "http://beta.quicklisp.org/quicklisp.lisp")
-          (funcall (intern "INSTALL" "QUICKLISP-QUICKSTART"))))))
+        (handler-case 
+            (load "https://beta.quicklisp.org/quicklisp.lisp")
+          (error (e)
+            (warn "Using insecure transport for remote installation
+              of Quicklisp:~&~A~&." e)
+            (load "http://beta.quicklisp.org/quicklisp.lisp"))))
+    (unless (find-package :quicklisp)
+      (funcall (intern "INSTALL" "QUICKLISP-QUICKSTART")))))
+