From f063afe536ae54ed2cc209938d3d2a5642bf4085 Mon Sep 17 00:00:00 2001 From: DottoDev <37108907+DottoDev@users.noreply.github.com> Date: Mon, 10 Oct 2022 20:26:20 +0000 Subject: [PATCH] Fix doom emacs upgrading (fix #961) (#13) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Authored-by: Rotem Yaari Approved-by: Thomas Schönauer --- src/steps/emacs.rs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/steps/emacs.rs b/src/steps/emacs.rs index 862ff16d..75ab817b 100644 --- a/src/steps/emacs.rs +++ b/src/steps/emacs.rs @@ -67,25 +67,24 @@ impl Emacs { print_separator("Doom Emacs"); let mut command = ctx.run_type().execute(doom); - command.args(&["-y", "upgrade"]); - if ctx.config().yes(Step::Emacs) { command.arg("--force"); } + command.args(&["upgrade"]); + command.check_run() } pub fn upgrade(&self, ctx: &ExecutionContext) -> Result<()> { let emacs = require("emacs")?; + if let Some(doom) = &self.doom { + Emacs::update_doom(doom, ctx)?; + } let init_file = require_option(self.directory.as_ref(), String::from("Emacs directory does not exist"))? .join("init.el") .require()?; - if let Some(doom) = &self.doom { - return Emacs::update_doom(doom, ctx); - } - print_separator("Emacs"); let mut command = ctx.run_type().execute(&emacs);