Commit 8d708b8b authored by Eric Timmons's avatar Eric Timmons
Browse files

cli less work: install

parent 4e131b55
Loading
Loading
Loading
Loading
+12 −19
Original line number Diff line number Diff line
@@ -6,17 +6,12 @@
(uiop:define-package #:clpm-cli/commands/install
    (:use #:cl
          #:clpm-cli/common-args
          #:clpm-cli/interface-defs
          #:clpm/config
          #:clpm/context
          #:clpm/install
          #:clpm/log)
  (:import-from #:adopt))
          #:clpm-cli/interface-defs)
  (:import-from #:adopt)
  (:import-from #:clpm))

(in-package #:clpm-cli/commands/install)

(setup-logger)

(adopt:define-string *help-text*
  "Install systems or projects into a context.")

@@ -124,15 +119,13 @@ with version constraint).
         (asd-files (gethash :install-asds options))
         (source-name (gethash :install-source options))
         (no-deps-p (gethash :install-no-deps options))
         (context-name (config-value :context))
         (yes-p (gethash :yes options))
         (ref (gethash :install-ref options)))
    (install :projects project-specifiers
    (clpm:install :projects project-specifiers
                  :systems system-specifiers
                  :asds (mapcar #'merge-pathnames asd-files)
                  :version version-string
                  :source source-name
             :context context-name
                  :no-deps-p no-deps-p
                  :ref ref
                  :validate (make-diff-validate-fun :yesp yes-p)
+2 −1
Original line number Diff line number Diff line
@@ -15,9 +15,10 @@
        #:clpm/sync
        #:clpm/update
        #:clpm/version)
  (:export #:install)
  ;; From config
  (:export #:config-value)
  ;; From install
  (:export #:install)
  ;; From source
  (:export #:source-name
           #:sources
+2 −1
Original line number Diff line number Diff line
@@ -99,7 +99,8 @@ will be installed.
VALIDATE must be a function of one argument (a diff) and returns non-NIL if the
install should proceed."
  (with-clpm-session ()
    (let ((reqs (append (mapcar (rcurry #'make-requirement
    (let ((context (get-context context))
          (reqs (append (mapcar (rcurry #'make-requirement
                                        :project
                                        :version version :source source :ref ref :no-deps-p no-deps-p)
                                projects)