From 4ceb09c219c22f72b3e9c55c1b5980a63b819289 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 10 Nov 2019 16:44:53 -0500 Subject: [PATCH] cli/upgrade: don't double-update packages And don't initialize too much of Doom before updating it. --- core/cli/upgrade.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/cli/upgrade.el b/core/cli/upgrade.el index dad07e387..7116d7395 100644 --- a/core/cli/upgrade.el +++ b/core/cli/upgrade.el @@ -1,8 +1,7 @@ ;;; core/cli/upgrade.el -*- lexical-binding: t; -*- (defcli! (upgrade up) - ((force-p ["-f" "--force"]) - &rest args) + ((force-p ["-f" "--force"])) "Updates Doom and packages. This requires that ~/.emacs.d is a git repo, and is the equivalent of the @@ -13,6 +12,7 @@ following shell commands: bin/doom clean bin/doom refresh bin/doom update" + :bare t (and (doom-cli-upgrade doom-auto-accept force-p) (doom-cli-packages-update) (doom-cli-reload-package-autoloads 'force-p))) @@ -101,7 +101,6 @@ following shell commands: (error "Failed to check out %s" (substring new-rev 0 10))) (print! (success "Finished upgrading Doom Emacs"))) (doom-cli-execute "refresh" (append (if auto-accept-p '("-y")) '("-f"))) - (doom-cli-execute "update" (if auto-accept-p '("-y"))) t) (print! (success "Done! Restart Emacs for changes to take effect."))))))