admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better Emacs handling in Windows (fix #112)

Browse Source
This commit is contained in:
Roey Darwish Dror
2019-03-12 08:54:19 +02:00
parent 12123ce6cc
commit bb1312e6d9
4 changed files with 54 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/steps/generic.rs
View File

@@ -7,8 +7,6 @@ use failure::ResultExt;
use std::path::PathBuf;
use std::process::Command;
const EMACS_UPGRADE: &str = include_str!("emacs.el");
pub fn run_cargo_update(run_type: RunType) -> Result<(), Error> {
let cargo_update = utils::require("cargo-install-update")?;
@@ -29,18 +27,6 @@ pub fn run_gem(base_dirs: &BaseDirs, run_type: RunType) -> Result<(), Error> {
run_type.execute(&gem).args(&["update", "--user-install"]).check_run()
}
pub fn run_emacs(base_dirs: &BaseDirs, run_type: RunType) -> Result<(), Error> {
let emacs = utils::require("emacs")?;
let init_file = base_dirs.home_dir().join(".emacs.d/init.el").require()?;
print_separator("Emacs");
run_type
.execute(&emacs)
.args(&["--batch", "-l", init_file.to_str().unwrap(), "--eval", EMACS_UPGRADE])
.check_run()
}
#[cfg(not(any(
target_os = "freebsd",
target_os = "openbsd",