diff --git a/core/cli/byte-compile.el b/core/cli/byte-compile.el index e1ca66a6c..ab65a3ad5 100644 --- a/core/cli/byte-compile.el +++ b/core/cli/byte-compile.el @@ -123,9 +123,9 @@ If RECOMPILE-P is non-nil, only recompile out-of-date files." (cl-return nil)) (print! - (info (if recompile-p - "Recompiling stale elc files..." - "Byte-compiling your config (may take a while)..."))) + (start (if recompile-p + "Recompiling stale elc files..." + "Byte-compiling your config (may take a while)..."))) (print-group! (require 'use-package) (condition-case e @@ -200,4 +200,5 @@ module. This does not include your byte-compiled, third party packages.'" finally do (print! (if success (success "All elc files deleted") - (info "No elc files to clean")))))) + (info "No elc files to clean")))) + t)) diff --git a/core/core-cli.el b/core/core-cli.el index c7b041275..a445468c6 100644 --- a/core/core-cli.el +++ b/core/core-cli.el @@ -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 stale." :bare t - (print! (green "Initiating a refresh of Doom Emacs...\n")) - (let (success) - (when (file-exists-p doom-env-file) - (doom-cli-reload-env-file 'force)) + (print! (start "Initiating a refresh of Doom Emacs...")) + (print-group! + (let (success) + (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 - ;; autoloads files. - (mapc #'doom--cli-delete-autoloads-file - (list doom-autoload-file - doom-package-autoload-file)) - (doom-initialize 'force 'noerror) - (doom-initialize-modules) + ;; Ensures that no pre-existing state pollutes the generation of the new + ;; autoloads files. + (mapc #'doom--cli-delete-autoloads-file + (list doom-autoload-file + doom-package-autoload-file)) + (doom-initialize 'force 'noerror) + (doom-initialize-modules) - (doom-cli-reload-core-autoloads (not if-necessary-p)) - (unwind-protect - (progn - (and (doom-cli-packages-install) - (setq success t)) - (and (doom-cli-packages-build) - (setq success t)) - (and (doom-cli-packages-purge purge-p 'builds-p purge-p) - (setq success t))) - (doom-cli-reload-package-autoloads (or success (not if-necessary-p))) - (doom-cli-byte-compile nil 'recompile)) - t)) + (doom-cli-reload-core-autoloads (not if-necessary-p)) + (unwind-protect + (progn + (and (doom-cli-packages-install) + (setq success t)) + (and (doom-cli-packages-build) + (setq success t)) + (and (doom-cli-packages-purge purge-p 'builds-p purge-p) + (setq success t))) + (doom-cli-reload-package-autoloads (or success (not if-necessary-p))) + (doom-cli-byte-compile nil 'recompile)) + t))) (load! "cli/env") (load! "cli/upgrade")