From 8958da4a330f03c2bac80d240095b0b02b82c04e Mon Sep 17 00:00:00 2001 From: Eitaro Fukamachi Date: Thu, 2 Nov 2023 23:18:09 +0000 Subject: [PATCH] Fix the quicklisp installer using a bundled client. --- install/quicklisp.lisp | 1 + utils/file.lisp | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/install/quicklisp.lisp b/install/quicklisp.lisp index 200d305d..14948796 100644 --- 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 index 45db2af0..49186f97 100644 --- a/utils/file.lisp +++ b/utils/file.lisp @@ -5,7 +5,7 @@ (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) @@ -13,4 +13,5 @@ (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)))