emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor refactor of package management api

Browse source
This commit is contained in:
Henrik Lissner 2018-05-18 01:11:20 +02:00
parent 7aecb85c34
commit 50401f6c09
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 42 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

75
core/autoload/packages.el
View file

@ -271,20 +271,17 @@ example; the package name can be omitted)."
(doom-delete-package name t) (doom-delete-package name t)
(user-error "%s is already installed" name))) (user-error "%s is already installed" name)))
(let* ((inhibit-message (not doom-debug-mode)) (let* ((inhibit-message (not doom-debug-mode))
(plist (or plist (cdr (assq name doom-packages)))) (plist (or plist (cdr (assq name doom-packages)))))
(recipe (plist-get plist :recipe)) (if-let* ((recipe (plist-get plist :recipe)))
quelpa-upgrade-p) (let (quelpa-upgrade-p)
(if recipe (quelpa recipe))
(condition-case-unless-debug _
(quelpa recipe)
('error
(let ((pkg-build-dir (expand-file-name (symbol-name name) quelpa-build-dir)))
(when (file-directory-p pkg-build-dir)
(delete-directory pkg-build-dir t)))))
(package-install name)) (package-install name))
(when (package-installed-p name) (if (not (package-installed-p name))
(cl-pushnew (cons name plist) doom-packages :test #'eq :key #'car) (let ((pkg-build-dir (expand-file-name (symbol-name name) quelpa-build-dir)))
t))) (when (file-directory-p pkg-build-dir)
(delete-directory pkg-build-dir t)))
(map-put doom-packages name plist #'eq)
name)))
(defun doom-update-package (name &optional force-p) (defun doom-update-package (name &optional force-p)
"Updates package NAME (a symbol) if it is out of date, using quelpa or "Updates package NAME (a symbol) if it is out of date, using quelpa or
@ -344,7 +341,8 @@ package.el as appropriate."
(message! "Looking for packages to install...") (message! "Looking for packages to install...")
(let ((packages (reverse (doom-get-missing-packages)))) (let ((packages (reverse (doom-get-missing-packages))))
(cond ((not packages) (cond ((not packages)
(message! (green "No packages to install!"))) (message! (green "No packages to install!"))
nil)
((not (or (getenv "YES") ((not (or (getenv "YES")
(y-or-n-p (y-or-n-p
@ -366,7 +364,8 @@ package.el as appropriate."
"ELPA")))) "ELPA"))))
(sort (cl-copy-list packages) #'doom--sort-alpha) (sort (cl-copy-list packages) #'doom--sort-alpha)
"\n"))))) "\n")))))
(message! (yellow "Aborted!"))) (message! (yellow "Aborted!"))
nil)
(t (t
(doom-refresh-packages-maybe doom-debug-mode) (doom-refresh-packages-maybe doom-debug-mode)
@ -374,20 +373,23 @@ package.el as appropriate."
(message! "Installing %s" (car pkg)) (message! "Installing %s" (car pkg))
(doom--condition-case! (doom--condition-case!
(message! "%s%s" (message! "%s%s"
(cond ((and (package-installed-p (car pkg)) (if (and (package-installed-p (car pkg))
(not (doom-package-different-backend-p (car pkg))) (not (doom-package-different-backend-p (car pkg)))
(not (doom-package-different-recipe-p (car pkg)))) (not (doom-package-different-recipe-p (car pkg))))
(dark (white "⚠ ALREADY INSTALLED"))) (dark (white "⚠ ALREADY INSTALLED"))
((doom-install-package (car pkg) (cdr pkg)) (condition-case e
(green "✓ DONE")) (if (doom-install-package (car pkg) (cdr pkg))
(t (green "✓ DONE")
(red "✕ FAILED"))) (red "✕ FAILED"))
(error
(red "✕ ERROR (%s)" e))))
(if (plist-member (cdr pkg) :pin) (if (plist-member (cdr pkg) :pin)
(format " [pinned: %s]" (plist-get (cdr pkg) :pin)) (format " [pinned: %s]" (plist-get (cdr pkg) :pin))
"")))) ""))))
(message! (bold (green "Finished!"))) (message! (bold (green "Finished!")))
(doom//reload-load-path)))))) (doom//reload-load-path)
t)))))
;;;###autoload ;;;###autoload
(defun doom//packages-update () (defun doom//packages-update ()
@ -399,7 +401,8 @@ package.el as appropriate."
(doom-refresh-packages-maybe doom-debug-mode) (doom-refresh-packages-maybe doom-debug-mode)
(let ((packages (sort (doom-get-outdated-packages) #'doom--sort-alpha))) (let ((packages (sort (doom-get-outdated-packages) #'doom--sort-alpha)))
(cond ((not packages) (cond ((not packages)
(message! (green "Everything is up-to-date"))) (message! (green "Everything is up-to-date"))
nil)
((not (or (getenv "YES") ((not (or (getenv "YES")
(y-or-n-p (y-or-n-p
@ -417,7 +420,8 @@ package.el as appropriate."
(package-version-join (cl-caddr pkg)))) (package-version-join (cl-caddr pkg))))
packages packages
"\n")))))) "\n"))))))
(message! (yellow "Aborted!"))) (message! (yellow "Aborted!"))
nil)
(t (t
(dolist (pkg packages) (dolist (pkg packages)
@ -429,7 +433,8 @@ package.el as appropriate."
(if result "✓ DONE" "✕ FAILED")))))) (if result "✓ DONE" "✕ FAILED"))))))
(message! (bold (green "Finished!"))) (message! (bold (green "Finished!")))
(doom//reload-load-path)))))) (doom//reload-load-path)
t)))))
;;;###autoload ;;;###autoload
(defun doom//packages-autoremove () (defun doom//packages-autoremove ()
@ -440,7 +445,8 @@ package.el as appropriate."
(message! "Looking for orphaned packages...") (message! "Looking for orphaned packages...")
(let ((packages (doom-get-orphaned-packages))) (let ((packages (doom-get-orphaned-packages)))
(cond ((not packages) (cond ((not packages)
(message! (green "No unused packages to remove"))) (message! (green "No unused packages to remove"))
nil)
((not ((not
(or (getenv "YES") (or (getenv "YES")
@ -453,13 +459,15 @@ package.el as appropriate."
(format "+ %s (%s)" sym (format "+ %s (%s)" sym
(let ((backend (doom-package-backend sym))) (let ((backend (doom-package-backend sym)))
(if (doom-package-different-backend-p sym) (if (doom-package-different-backend-p sym)
(if (eq backend 'quelpa) (pcase backend
"QUELPA->ELPA" (`quelpa "QUELPA->ELPA")
"ELPA->QUELPA") (`elpa "ELPA->QUELPA")
(_ "removed"))
(upcase (symbol-name backend)))))) (upcase (symbol-name backend))))))
(sort (cl-copy-list packages) #'string-lessp) (sort (cl-copy-list packages) #'string-lessp)
"\n"))))) "\n")))))
(message! (yellow "Aborted!"))) (message! (yellow "Aborted!"))
nil)
(t (t
(dolist (pkg packages) (dolist (pkg packages)
@ -472,7 +480,8 @@ package.el as appropriate."
pkg))))) pkg)))))
(message! (bold (green "Finished!"))) (message! (bold (green "Finished!")))
(doom//reload-load-path)))))) (doom//reload-load-path)
t)))))
;; ;;