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

cli/upgrade: 'doom refresh' after upgrading, before updating

Browse source 
Fixes an issue where uninitialized packages aren't installed when 'doom
update' tries to update them.
This commit is contained in:
Henrik Lissner 2019-11-24 19:37:29 -05:00
parent 5b190c9eca
commit 570894e1c8
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
core/cli/upgrade.el
View file

@ -13,12 +13,15 @@ following shell commands:
bin/doom refresh bin/doom refresh
bin/doom update" bin/doom update"
:bare t :bare t
(when (doom-cli-upgrade doom-auto-accept force-p) (if (delq
(require 'core-packages) nil (list
(doom-initialize) (doom-cli-upgrade doom-auto-accept force-p)
(doom-initialize-packages) (doom-cli-execute "refresh" (if doom-auto-accept '("-y")))
(when (doom-cli-packages-update) (when (doom-cli-packages-update)
(doom-cli-reload-package-autoloads 'force)))) (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)) (equal (vc-git--rev-parse "HEAD") new-rev))
(error "Failed to check out %s" (substring new-rev 0 10))) (error "Failed to check out %s" (substring new-rev 0 10)))
(print! (success "Finished upgrading Doom Emacs"))) (print! (success "Finished upgrading Doom Emacs")))
(doom-cli-execute "refresh" (if auto-accept-p '("-y"))) t)))))
t)
(print! (success "Done! Restart Emacs for changes to take effect."))))))
(ignore-errors (ignore-errors
(doom-call-process "git" "remote" "remove" doom-repo-remote)))))) (doom-call-process "git" "remote" "remove" doom-repo-remote))))))