From a81aa555a8b4fcc9aa7b6387dd302f0541464962 Mon Sep 17 00:00:00 2001 From: Hugo Haas Date: Wed, 12 Feb 2020 23:59:28 -0600 Subject: [PATCH] zplugin was renamed to zinit (#320) --- src/main.rs | 2 +- src/steps/zsh.rs | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main.rs b/src/main.rs index 709c8d20..727957d7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -217,7 +217,7 @@ fn run() -> Result<()> { runner.execute("antibody", || zsh::run_antibody(run_type))?; runner.execute("antigen", || zsh::run_antigen(&base_dirs, run_type))?; runner.execute("zplug", || zsh::run_zplug(&base_dirs, run_type))?; - runner.execute("zplugin", || zsh::run_zplugin(&base_dirs, run_type))?; + runner.execute("zinit", || zsh::run_zinit(&base_dirs, run_type))?; runner.execute("oh-my-zsh", || zsh::run_oh_my_zsh(&base_dirs, run_type))?; runner.execute("fisher", || unix::run_fisher(&base_dirs, run_type))?; runner.execute("tmux", || tmux::run_tpm(&base_dirs, run_type))?; diff --git a/src/steps/zsh.rs b/src/steps/zsh.rs index 25972cde..48bf4b98 100644 --- a/src/steps/zsh.rs +++ b/src/steps/zsh.rs @@ -64,21 +64,18 @@ pub fn run_zplug(base_dirs: &BaseDirs, run_type: RunType) -> Result<()> { run_type.execute(zsh).args(&["-l", "-c", cmd.as_str()]).check_run() } -pub fn run_zplugin(base_dirs: &BaseDirs, run_type: RunType) -> Result<()> { +pub fn run_zinit(base_dirs: &BaseDirs, run_type: RunType) -> Result<()> { let zsh = require("zsh")?; let zshrc = zshrc(base_dirs).require()?; - env::var("ZPLGM[HOME_DIR]") + env::var("ZPFX") .map(PathBuf::from) - .unwrap_or_else(|_| base_dirs.home_dir().join(".zplugin")) + .unwrap_or_else(|_| base_dirs.home_dir().join(".zinit")) .require()?; - print_separator("zplugin"); + print_separator("zinit"); - let cmd = format!( - "source {} && zplugin self-update && zplugin update --all", - zshrc.display() - ); + let cmd = format!("source {} && zinit self-update && zinit update --all", zshrc.display()); run_type.execute(zsh).args(&["-l", "-c", cmd.as_str()]).check_run() }