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

Fix oh-my-zsh

Browse Source
This commit is contained in:
Roey Darwish Dror
2020-03-30 10:37:23 +03:00
parent a04680720c
commit 78ebee9ce2
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/steps/zsh.rs
View File

@@ -98,17 +98,18 @@ pub fn run_oh_my_zsh(ctx: &ExecutionContext) -> Result<()> {
debug!("oh-my-zsh custom dir: {}", custom_dir.display()); debug!("oh-my-zsh custom dir: {}", custom_dir.display());
let mut custom_plugins = Repositories::new(ctx.git()); if let Ok(custom_plugins_dir) = fs::read_dir(custom_dir) {
for entry in fs::read_dir(custom_dir)? { let mut custom_plugins = Repositories::new(ctx.git());
let entry = entry?;
custom_plugins.insert_if_repo(entry.path());
}
custom_plugins.remove(&oh_my_zsh.to_string_lossy()); for entry in custom_plugins_dir? {
let entry = entry?;
if !custom_plugins.is_empty() { custom_plugins.insert_if_repo(entry.path());
println!("Pulling custom plugins"); }
ctx.git().multi_pull(&custom_plugins, ctx)?; custom_plugins.remove(&oh_my_zsh.to_string_lossy());
if !custom_plugins.is_empty() {
println!("Pulling custom plugins");
ctx.git().multi_pull(&custom_plugins, ctx)?;
}
} }
ctx.run_type() ctx.run_type()