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

Fix the confusion between zplugin and zplug (fix #328) (#330)

Browse Source
This commit is contained in:
Roey Darwish Dror
2020-02-20 16:03:01 +02:00
committed by GitHub
parent 616c313f82
commit 30e1318dd7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/steps/zsh.rs
View File

@@ -74,15 +74,15 @@ pub fn run_zinit(base_dirs: &BaseDirs, run_type: RunType) -> Result<()> {
.unwrap_or_else(|_| base_dirs.home_dir().join(".zinit")) .unwrap_or_else(|_| base_dirs.home_dir().join(".zinit"))
.exists(); .exists();
let zplug_exists = env::var("ZPLUG_HOME") let zplugin_exists = env::var("ZPLUG_HOME")
.map(PathBuf::from) .map(PathBuf::from)
.unwrap_or_else(|_| base_dirs.home_dir().join("zplug")) .unwrap_or_else(|_| base_dirs.home_dir().join(".zplugin"))
.exists(); .exists();
// Check whether this is a pre- or post- renaming installation // Check whether this is a pre- or post- renaming installation
let zcommand = if zinit_exists { let zcommand = if zinit_exists {
"zinit" "zinit"
} else if zplug_exists { } else if zplugin_exists {
"zplugin" "zplugin"
} else { } else {
return Err(SkipStep.into()); return Err(SkipStep.into());