From 7282ece7f3d446526e6642b6bc0e5f38ec76ed85 Mon Sep 17 00:00:00 2001 From: SANO Masatoshi Date: Thu, 10 Nov 2016 23:53:03 +0900 Subject: [PATCH] change '*checkout-default*'. I'll change it further. --- lisp/util-install.lisp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/lisp/util-install.lisp b/lisp/util-install.lisp index 5370057..61f267b 100644 --- a/lisp/util-install.lisp +++ b/lisp/util-install.lisp @@ -117,13 +117,8 @@ ARGV2 contains a (possibly modified) ARGV.") when (eql (aref href 0) #\/) collect (funcall filter href))))) -(defun checkout-github (impl version tag argv) - (clone-github impl version :path "local-projects" :branch tag) - (read-call "quicklisp-client:register-local-projects") - (values (or (and (install-impl-if-probed version nil argv) - (or (setf argv nil) t)) - (install-system-if-probed version)) - argv)) +(defun checkout-github (impl version tag) + (clone-github impl version :path "local-projects" :branch tag)) (defun install (argv) (read-call "quicklisp-client:register-local-projects") @@ -150,7 +145,11 @@ ARGV2 contains a (possibly modified) ARGV.") ((install-localpath-if-probed impl/version/tag)) ;;github registerd system like "fukamachi/sblint" checkout (version - (setf (values _ argv) (funcall *checkout-default* impl version tag argv))) + (funcall *checkout-default* impl version tag) + (read-call "quicklisp-client:register-local-projects") + (or (and (install-impl-if-probed version nil argv) + (or (setf argv nil) t)) + (install-system-if-probed version))) (t (format *error-output* "'~A' is not a valid target for 'install' -- It should be a name of either: + a quicklisp-installable system + a common lisp installation ~%" impl)