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

Fix doom//upgrade failing to detect branch & clean *.elc files before updating

Browse source
This commit is contained in:
Henrik Lissner 2018-05-25 16:55:42 +02:00
parent becc79089e
commit ef9b30cdef
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/core-dispatcher.el
View file

@ -215,7 +215,7 @@ recompile. Run this whenever you:
"Upgrade Doom to the latest version." "Upgrade Doom to the latest version."
(interactive) (interactive)
(require 'vc-git) (require 'vc-git)
(let* ((core-file (expand-file-name "init.el" doom-core-dir)) (let* ((core-file (expand-file-name "core.el" doom-core-dir))
(branch (vc-git--symbolic-ref core-file)) (branch (vc-git--symbolic-ref core-file))
(default-directory doom-emacs-dir)) (default-directory doom-emacs-dir))
(unless (file-exists-p core-file) (unless (file-exists-p core-file)
@ -239,12 +239,12 @@ recompile. Run this whenever you:
(message "Doom is up to date!") (message "Doom is up to date!")
(when (or doom-auto-accept (when (or doom-auto-accept
(y-or-n-p "Doom is out of date, update?")) (y-or-n-p "Doom is out of date, update?"))
(unless (zerop (process-file "git" nil buf nil
"checkout" (format "%s/%s" doom-remote branch)))
(error "An error occurred while checking out the latest commit"))
(when (file-exists-p (byte-compile-dest-file core-file)) (when (file-exists-p (byte-compile-dest-file core-file))
(message "Your config is byte-compiled, removing byte-compiled files") (message "Your config is byte-compiled, removing byte-compiled files")
(doom//clean-byte-compiled-files)) (doom//clean-byte-compiled-files))
(unless (zerop (process-file "git" nil buf nil
"checkout" (format "%s/%s" doom-remote branch)))
(error "An error occurred while checking out the latest commit"))
(doom//reload) (doom//reload)
(message "Done! Please restart Emacs for changes to take effect"))))))))) (message "Done! Please restart Emacs for changes to take effect")))))))))