Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install Roswell scripts under quicklisp/bin/. #35

Merged
merged 2 commits into from Nov 3, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion roswell/qlot.ros
@@ -1,7 +1,7 @@
#!/bin/sh
#|-*- mode:lisp -*-|#
#|
exec ros -Q -- $0 "$@"
exec ros +Q -- $0 "$@"
|#

(defun main (&optional $1 &rest argv)
Expand Down
26 changes: 23 additions & 3 deletions src/install.lisp
Expand Up @@ -36,6 +36,8 @@
:ensure-directory-pathname
:absolute-pathname-p
:file-exists-p
:directory-files
:copy-file
:directory-exists-p
:directory-pathname-p
:pathname-directory-pathname
Expand Down Expand Up @@ -219,9 +221,27 @@
(unless (typep source 'qlot.source.ql:source-ql-all)
(let ((*standard-output* (make-broadcast-stream))
(*trace-output* (make-broadcast-stream)))
(with-package-functions :ql-dist (dist provided-releases ensure-installed)
(map nil #'ensure-installed
(provided-releases (dist (source-dist-name source)))))))
(with-package-functions :ql-dist (dist provided-releases ensure-installed base-directory)
(let ((releases (provided-releases (dist (source-dist-name source)))))
(dolist (release releases)
(ensure-installed release)

;; Install Roswell scripts.
(let* ((ros-dir (merge-pathnames #P"roswell/" (base-directory release)))
(bin-dir (merge-pathnames #P"bin/" qlhome))
(scripts (uiop:directory-files ros-dir "*.*")))
(when scripts
(ensure-directories-exist bin-dir)
(dolist (script scripts)
(let ((to (make-pathname
:name (pathname-name script)
:defaults bin-dir
:type #+unix (if (equalp (pathname-type script) "ros")
nil
(pathname-type script))
#-unix (pathname-type script))))
(uiop:copy-file script to)
#+sbcl (sb-posix:chmod to #o700))))))))))

(with-package-functions :ql-dist (dist (setf preference))
(setf (preference (dist (source-dist-name source)))
Expand Down