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

zplugin was renamed to zinit (#320)

Browse Source
This commit is contained in:
Hugo Haas
2020-02-12 23:59:28 -06:00
committed by GitHub
parent afbd82f7e2
commit a81aa555a8
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.rs
View File

@@ -217,7 +217,7 @@ fn run() -> Result<()> {
runner.execute("antibody", || zsh::run_antibody(run_type))?; runner.execute("antibody", || zsh::run_antibody(run_type))?;
runner.execute("antigen", || zsh::run_antigen(&base_dirs, run_type))?; runner.execute("antigen", || zsh::run_antigen(&base_dirs, run_type))?;
runner.execute("zplug", || zsh::run_zplug(&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("oh-my-zsh", || zsh::run_oh_my_zsh(&base_dirs, run_type))?;
runner.execute("fisher", || unix::run_fisher(&base_dirs, run_type))?; runner.execute("fisher", || unix::run_fisher(&base_dirs, run_type))?;
runner.execute("tmux", || tmux::run_tpm(&base_dirs, run_type))?; runner.execute("tmux", || tmux::run_tpm(&base_dirs, run_type))?;

13
src/steps/zsh.rs
View File

@@ -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() 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 zsh = require("zsh")?;
let zshrc = zshrc(base_dirs).require()?; let zshrc = zshrc(base_dirs).require()?;
env::var("ZPLGM[HOME_DIR]") env::var("ZPFX")
.map(PathBuf::from) .map(PathBuf::from)
.unwrap_or_else(|_| base_dirs.home_dir().join(".zplugin")) .unwrap_or_else(|_| base_dirs.home_dir().join(".zinit"))
.require()?; .require()?;
print_separator("zplugin"); print_separator("zinit");
let cmd = format!( let cmd = format!("source {} && zinit self-update && zinit update --all", zshrc.display());
"source {} && zplugin self-update && zplugin update --all",
zshrc.display()
);
run_type.execute(zsh).args(&["-l", "-c", cmd.as_str()]).check_run() run_type.execute(zsh).args(&["-l", "-c", cmd.as_str()]).check_run()
} }