From 497c56cec72f857277bbbdba01cde2f888046730 Mon Sep 17 00:00:00 2001 From: Roey Darwish Dror Date: Fri, 6 Mar 2020 10:57:30 +0200 Subject: [PATCH] Fix zplug and zinit (#354) --- src/steps/zsh.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/steps/zsh.rs b/src/steps/zsh.rs index cf94faa8..2291b3e0 100644 --- a/src/steps/zsh.rs +++ b/src/steps/zsh.rs @@ -51,7 +51,7 @@ pub fn run_antigen(base_dirs: &BaseDirs, run_type: RunType) -> Result<()> { pub fn run_zplug(base_dirs: &BaseDirs, run_type: RunType) -> Result<()> { let zsh = require("zsh")?; - let zshrc = zshrc(base_dirs).require()?; + zshrc(base_dirs).require()?; env::var("ZPLUG_HOME") .map(PathBuf::from) @@ -60,8 +60,7 @@ pub fn run_zplug(base_dirs: &BaseDirs, run_type: RunType) -> Result<()> { print_separator("zplug"); - let cmd = format!("source {} && zplug update", zshrc.display()); - run_type.execute(zsh).args(&["-l", "-c", cmd.as_str()]).check_run() + run_type.execute(zsh).args(&["-i", "-c", "zplug update"]).check_run() } pub fn run_zinit(base_dirs: &BaseDirs, run_type: RunType) -> Result<()> { @@ -76,7 +75,7 @@ pub fn run_zinit(base_dirs: &BaseDirs, run_type: RunType) -> Result<()> { print_separator("zinit"); let cmd = format!("source {} && zinit self-update && zinit update --all", zshrc.display(),); - run_type.execute(zsh).args(&["-l", "-c", cmd.as_str()]).check_run() + run_type.execute(zsh).args(&["-i", "-c", cmd.as_str()]).check_run() } pub fn run_oh_my_zsh(base_dirs: &BaseDirs, run_type: RunType) -> Result<()> {