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

62
src/main.rs
View File

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