Skip to content
This repository has been archived by the owner on Oct 12, 2022. It is now read-only.

Fix Doom upgrade command #968

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix Doom upgrade command #968

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a3b399
Fix Doom upgrade command
reinaldoossuna Jul 6, 2022
c3e76fe
Check for Doom-Emacs before init-file
Jul 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/steps/emacs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ impl Emacs {
print_separator("Doom Emacs");

let mut command = ctx.run_type().execute(doom);
command.args(&["-y", "upgrade"]);
command.args(&["upgrade"]);

if ctx.config().yes(Step::Emacs) {
command.arg("--force");
Expand All @@ -78,14 +78,14 @@ impl Emacs {

pub fn upgrade(&self, ctx: &ExecutionContext) -> Result<()> {
let emacs = require("emacs")?;
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);
}

let init_file = require_option(self.directory.as_ref(), String::from("Emacs directory does not exist"))?
.join("init.el")
.require()?;

print_separator("Emacs");

let mut command = ctx.run_type().execute(&emacs);
Expand Down