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

Create Shell step for various shell utilities (#217)

Browse Source
This commit is contained in:
Jonathan Dahan
2019-09-05 13:38:45 -04:00
committed by Roey Darwish Dror
parent 94c0102885
commit f51a26494d
2 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/config.rs
View File

@@ -33,6 +33,7 @@ lazy_static! {
m.insert("remotes", Step::Remotes); m.insert("remotes", Step::Remotes);
m.insert("rustup", Step::Rustup); m.insert("rustup", Step::Rustup);
m.insert("cargo", Step::Cargo); m.insert("cargo", Step::Cargo);
m.insert("shell", Step::Shell);
#[cfg(windows)] #[cfg(windows)]
m.insert("powershell", Step::Powershell); m.insert("powershell", Step::Powershell);
@@ -65,6 +66,8 @@ pub enum Step {
/// Don't run Cargo /// Don't run Cargo
Cargo, Cargo,
/// Don't update Powershell modules /// Don't update Powershell modules
Shell,
/// Don't run shell updates (zplug, zr, oh-my-zsh, fisher, tmux)
Powershell, Powershell,
} }

62
src/main.rs
View File

@@ -260,36 +260,38 @@ fn run() -> Result<(), Error> {
#[cfg(unix)] #[cfg(unix)]
{ {
execute( if config.should_run(Step::Shell) {
&mut report, execute(
"zr", &mut report,
|| unix::run_zr(&base_dirs, run_type), "zr",
config.no_retry(), || unix::run_zr(&base_dirs, run_type),
)?; config.no_retry(),
execute( )?;
&mut report, execute(
"zplug", &mut report,
|| unix::run_zplug(&base_dirs, run_type), "zplug",
config.no_retry(), || unix::run_zplug(&base_dirs, run_type),
)?; config.no_retry(),
execute( )?;
&mut report, execute(
"oh-my-zsh", &mut report,
|| unix::run_oh_my_zsh(run_type), "oh-my-zsh",
config.no_retry(), || unix::run_oh_my_zsh(run_type),
)?; config.no_retry(),
execute( )?;
&mut report, execute(
"fisher", &mut report,
|| unix::run_fisher(&base_dirs, run_type), "fisher",
config.no_retry(), || unix::run_fisher(&base_dirs, run_type),
)?; config.no_retry(),
execute( )?;
&mut report, execute(
"tmux", &mut report,
|| tmux::run_tpm(&base_dirs, run_type), "tmux",
config.no_retry(), || tmux::run_tpm(&base_dirs, run_type),
)?; config.no_retry(),
)?;
}
} }
if config.should_run(Step::Rustup) { if config.should_run(Step::Rustup) {