From 894966b1e238998129e95d669b20612b507bfddf Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 26 May 2020 02:55:24 -0400 Subject: [PATCH] Fix #3221: incorrect usage of doom-cli-execute The function is variadic in as-of-yet published versions of Doom's CLI; this usage snuck into a commit. --- core/cli/upgrade.el | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/core/cli/upgrade.el b/core/cli/upgrade.el index 94f00b5ad..ab1ac4d3e 100644 --- a/core/cli/upgrade.el +++ b/core/cli/upgrade.el @@ -17,17 +17,16 @@ following shell commands: (let ((doom-auto-discard force-p)) (cond (packages-only-p - (doom-cli-execute "sync" "-u") + (doom-cli-execute "sync" '("-u")) (print! (success "Finished upgrading Doom Emacs"))) - ((not (doom-cli-upgrade doom-auto-accept doom-auto-discard)) - (print! "Nothing to do. Doom is up-to-date!")) - - (t - ;; Reload Doom's CLI & libraries, in case there were any - ;; upstream changes. Major changes will still break, however + ((doom-cli-upgrade doom-auto-accept doom-auto-discard) + ;; Reload Doom's CLI & libraries, in case there were any upstream changes. + ;; Major changes will still break, however (print! (info "Reloading Doom Emacs")) - (doom-cli-execute-after "doom" "upgrade" "-p" (if force-p "-f")))))) + (doom-cli-execute-after "doom" '("upgrade" "-p" (if force-p "-f")))) + + ((print! "Nothing to do. Doom is up-to-date!"))))) ;;