Use portable PATHNAME functions

melusina-org · Oct 2, 2023 · f1ec008 · f1ec008
1 parent 6bff31f
commit f1ec008
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/action.yaml b/action.yaml
@@ -30,7 +30,7 @@ outputs:
     description: >-
       The installation directory for the QuickLisp distribution.
   quicklisp-local-projects:
-    value: '${{ steps.setup-quicklisp.outputs.quicklisp-home }}/local-projects'
+    value: '${{ steps.setup-quicklisp.outputs.quicklisp-local-projects }}'
     description: >-
       The local project directory for the QuickLisp distribution.
 runs:

diff --git a/setup-quicklisp.lisp b/setup-quicklisp.lisp
@@ -52,10 +52,11 @@
 
 (defparameter *quicklisp-home*
   (or
-   (uiop:getenv "QUICKLISP_HOME")
+   (uiop:getenv-absolute-directory "QUICKLISP_HOME")
+   (uiop:merge-pathnames*
    (merge-pathnames
-    #p"quicklisp/"
-    (user-homedir-pathname)))
+    (make-pathname :directory (list :relative "quicklisp"))
+    (user-homedir-pathname))))
   "Home directory for QuickLisp.")
 
 (defparameter *quicklisp-register-local-projects*
@@ -120,7 +121,13 @@ to job output."
   (write-detail
    :name "QuickLisp Home"
    :key "quicklisp-home"
-   :value *quicklisp-home*))
+   :value *quicklisp-home*)
+  (write-detail
+   :name "QuickLisp Local Projects"
+   :key "quicklisp-local-projects"
+   :value (uiop:merge-pathnames*
+	   (make-pathname :directory (list :relative "local-projects"))
+	   *quicklisp-home*)))
 
 (progn
   (install-quicklisp)