From ef9b30cdefad66b80561e08f88f76fa91b2a605b Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 25 May 2018 16:55:42 +0200 Subject: [PATCH] Fix doom//upgrade failing to detect branch & clean *.elc files before updating --- core/core-dispatcher.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/core-dispatcher.el b/core/core-dispatcher.el index fa33c2383..bc68fe31c 100644 --- a/core/core-dispatcher.el +++ b/core/core-dispatcher.el @@ -215,7 +215,7 @@ recompile. Run this whenever you: "Upgrade Doom to the latest version." (interactive) (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)) (default-directory doom-emacs-dir)) (unless (file-exists-p core-file) @@ -239,12 +239,12 @@ recompile. Run this whenever you: (message "Doom is up to date!") (when (or doom-auto-accept (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)) (message "Your config is byte-compiled, removing 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) (message "Done! Please restart Emacs for changes to take effect")))))))))