Slight reformatting of 'doom refresh' & 'doom compile' output

This commit is contained in:
Henrik Lissner 2019-12-08 00:57:10 -05:00
parent ecb76d536b
commit dc8b3dd57d
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 29 additions and 27 deletions

View file

@ -123,9 +123,9 @@ If RECOMPILE-P is non-nil, only recompile out-of-date files."
(cl-return nil)) (cl-return nil))
(print! (print!
(info (if recompile-p (start (if recompile-p
"Recompiling stale elc files..." "Recompiling stale elc files..."
"Byte-compiling your config (may take a while)..."))) "Byte-compiling your config (may take a while)...")))
(print-group! (print-group!
(require 'use-package) (require 'use-package)
(condition-case e (condition-case e
@ -200,4 +200,5 @@ module. This does not include your byte-compiled, third party packages.'"
finally do finally do
(print! (if success (print! (if success
(success "All elc files deleted") (success "All elc files deleted")
(info "No elc files to clean")))))) (info "No elc files to clean"))))
t))

View file

@ -238,31 +238,32 @@ It will ensure that unneeded packages are removed, all needed packages are
installed, autoloads files are up-to-date and no byte-compiled files have gone installed, autoloads files are up-to-date and no byte-compiled files have gone
stale." stale."
:bare t :bare t
(print! (green "Initiating a refresh of Doom Emacs...\n")) (print! (start "Initiating a refresh of Doom Emacs..."))
(let (success) (print-group!
(when (file-exists-p doom-env-file) (let (success)
(doom-cli-reload-env-file 'force)) (when (file-exists-p doom-env-file)
(doom-cli-reload-env-file 'force))
;; Ensures that no pre-existing state pollutes the generation of the new ;; Ensures that no pre-existing state pollutes the generation of the new
;; autoloads files. ;; autoloads files.
(mapc #'doom--cli-delete-autoloads-file (mapc #'doom--cli-delete-autoloads-file
(list doom-autoload-file (list doom-autoload-file
doom-package-autoload-file)) doom-package-autoload-file))
(doom-initialize 'force 'noerror) (doom-initialize 'force 'noerror)
(doom-initialize-modules) (doom-initialize-modules)
(doom-cli-reload-core-autoloads (not if-necessary-p)) (doom-cli-reload-core-autoloads (not if-necessary-p))
(unwind-protect (unwind-protect
(progn (progn
(and (doom-cli-packages-install) (and (doom-cli-packages-install)
(setq success t)) (setq success t))
(and (doom-cli-packages-build) (and (doom-cli-packages-build)
(setq success t)) (setq success t))
(and (doom-cli-packages-purge purge-p 'builds-p purge-p) (and (doom-cli-packages-purge purge-p 'builds-p purge-p)
(setq success t))) (setq success t)))
(doom-cli-reload-package-autoloads (or success (not if-necessary-p))) (doom-cli-reload-package-autoloads (or success (not if-necessary-p)))
(doom-cli-byte-compile nil 'recompile)) (doom-cli-byte-compile nil 'recompile))
t)) t)))
(load! "cli/env") (load! "cli/env")
(load! "cli/upgrade") (load! "cli/upgrade")