From 570894e1c8bd3db7e60559de3baf19c253d56140 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 24 Nov 2019 19:37:29 -0500 Subject: [PATCH] cli/upgrade: 'doom refresh' after upgrading, before updating Fixes an issue where uninitialized packages aren't installed when 'doom update' tries to update them. --- core/cli/upgrade.el | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/core/cli/upgrade.el b/core/cli/upgrade.el index 7b9912ecf..70dbd54e1 100644 --- a/core/cli/upgrade.el +++ b/core/cli/upgrade.el @@ -13,12 +13,15 @@ following shell commands: bin/doom refresh bin/doom update" :bare t - (when (doom-cli-upgrade doom-auto-accept force-p) - (require 'core-packages) - (doom-initialize) - (doom-initialize-packages) - (when (doom-cli-packages-update) - (doom-cli-reload-package-autoloads 'force)))) + (if (delq + nil (list + (doom-cli-upgrade doom-auto-accept force-p) + (doom-cli-execute "refresh" (if doom-auto-accept '("-y"))) + (when (doom-cli-packages-update) + (doom-cli-reload-package-autoloads 'force) + t))) + (print! (success "Done! Restart Emacs for changes to take effect.")) + (print! "Nothing to do. Doom is up-to-date!"))) ;; @@ -103,9 +106,6 @@ following shell commands: (equal (vc-git--rev-parse "HEAD") new-rev)) (error "Failed to check out %s" (substring new-rev 0 10))) (print! (success "Finished upgrading Doom Emacs"))) - (doom-cli-execute "refresh" (if auto-accept-p '("-y"))) - t) - - (print! (success "Done! Restart Emacs for changes to take effect.")))))) + t))))) (ignore-errors (doom-call-process "git" "remote" "remove" doom-repo-remote))))))