Improve make install and make update info prompts

This commit is contained in:
Henrik Lissner 2017-02-08 01:59:29 -05:00
parent 83f4abe100
commit a18e8f0104

View file

@ -259,14 +259,16 @@ appropriate."
(dolist (pkg packages) (dolist (pkg packages)
(condition-case ex (condition-case ex
(doom-message "%s %s (%s)" (doom-message "%s %s (%s)"
(if (doom-install-package (car pkg) (cdr pkg)) (cond ((package-installed-p (car pkg))
"Installed" "Skipped (already installed)")
"Failed to install") ((doom-install-package (car pkg) (cdr pkg))
"Installed")
(t "Failed to install"))
pkg pkg
(cond ((cdr pkg) "QUELPA") (cond ((cdr pkg) "QUELPA")
(t "ELPA"))) (t "ELPA")))
(error (error
(doom-message "Error installing %s: %s" (car pkg) ex)))) (doom-message "Error (%s): %s" (car pkg) ex))))
(doom-message "Finished!"))))) (doom-message "Finished!")))))
@ -281,15 +283,16 @@ appropriate."
((not (y-or-n-p ((not (y-or-n-p
(format "%s packages will be updated:\n\n%s\n\nProceed?" (format "%s packages will be updated:\n\n%s\n\nProceed?"
(length packages) (length packages)
(let* ((-packages (--map (symbol-name (car it)) packages))
(-max-len (or (-max (-map 'length -packages)) 10)))
(mapconcat (mapconcat
(lambda (pkg) (format "+ %s %s -> %s\t%s" (lambda (pkg) (let ((desc (assq pkg packages)))
(s-pad-right 20 " " (symbol-name (car pkg))) (format "+ %s %s\t-> %s"
(car (cdr pkg)) (s-pad-right (+ -max-len 2) " " pkg)
(car (cdr (cdr pkg))))) (car (cdr desc))
(--sort (string-lessp (symbol-name (car it)) (car (cdr (cdr desc))))))
(symbol-name (car other))) (-sort 'string-lessp -packages)
packages) "\n")))))
"\n"))))
(message "Aborted!")) (message "Aborted!"))
(t (t