ros install will put script into env/envname/bin.

This commit is contained in:
SANO Masatoshi 2017-09-19 01:15:46 +09:00
parent 66e7839f56
commit 7879aabf7e
3 changed files with 7 additions and 6 deletions

View file

@ -179,10 +179,11 @@ have the latest asdf, and this file has a workaround for this.
(when (probe-file path)
(cl:load path :verbose (verbose))
(loop with symbol = (read-from-string "ql:*local-project-directories*")
for path in `(,local ,@(and (or path (and environment (getenv environment)))
`(,(merge-pathnames (format nil "env/~A/local-projects/" (opt "roswellenv"))
(opt "homedir"))
,(merge-pathnames "local-projects/" (opt "homedir")))))
for path in `(,local
,(when (opt "roswellenv")
(merge-pathnames (format nil "env/~A/local-projects/" (opt "roswellenv"))
(opt "homedir")))
,(merge-pathnames "local-projects/" (opt "homedir")))
for probe = (and path (or (ignore-errors (probe-file path))
#+clisp(ext:probe-directory path)))
when probe

View file

@ -122,7 +122,7 @@
(defun install-ros (from)
(let ((to (ensure-directories-exist
(make-pathname
:defaults (merge-pathnames "bin/" (homedir))
:defaults (merge-pathnames "bin/" (checkoutdir))
:name (pathname-name from)
:type (unless (or (equalp (pathname-type from) "ros"))
(pathname-type from))))))

View file

@ -3,7 +3,7 @@
(:use :cl)
(:import-from :ros :opt :ensure-asdf)
(:export
:uname :uname-m :homedir :config :impl :which :config-env
:uname :uname-m :homedir :config :impl :which :config-env :checkoutdir
:parse-version-spec :download :expand :sh :chdir :system :module
:core-extention :clone-github :opt :read-call :set-opt :copy-dir
:roswell-installable-searcher :setenv :unsetenv :ensure-asdf))