Fix the quicklisp installer using a bundled client.

fukamachi · Nov 2, 2023 · 8958da4 · 8958da4
1 parent 237cb32
commit 8958da4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/install/quicklisp.lisp b/install/quicklisp.lisp
@@ -24,6 +24,7 @@
     (copy-directory quicklisp-client path
                     :exclude (lambda (file)
                                (not (or (equal (pathname-type file) "lisp")
+                                        (equal (pathname-type file) "asd")
                                         (equal (file-namestring file) "version.txt"))))))
   (mapc #'ensure-directories-exist
         (mapcar (lambda (dirname)

diff --git a/utils/file.lisp b/utils/file.lisp
@@ -5,12 +5,13 @@
 
 (defun copy-directory (dir destination &key exclude)
   (let ((files
-          (remove-if (or exclude #'identity) (uiop:directory-files dir))))
+          (remove-if (or exclude (constantly nil)) (uiop:directory-files dir))))
     (when files
       (ensure-directories-exist destination)
       (dolist (file files)
         (uiop:copy-file file
                         (merge-pathnames (file-namestring file) destination)))))
   (dolist (subdir (uiop:subdirectories dir))
     (copy-directory subdir
-                    (merge-pathnames (enough-namestring subdir dir) destination))))
+                    (merge-pathnames (enough-namestring subdir dir) destination)
+                    :exclude exclude)))