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

Split brew cask into a seperate step (fix #588) (#593)

Browse Source
This commit is contained in:
Roey Darwish Dror
2020-12-30 10:35:50 +02:00
committed by GitHub
parent 1e66a47764
commit 31db02d95a
3 changed files with 48 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main.rs
View File

@@ -137,7 +137,9 @@ fn run() -> Result<()> {
linux::run_etc_update(sudo.as_ref(), run_type)
})?;
runner.execute(Step::Brew, "Brew", || unix::run_brew(&ctx, unix::BrewVariant::Linux))?;
runner.execute(Step::BrewFormula, "Brew", || {
unix::run_brew_formula(&ctx, unix::BrewVariant::Linux)
})?;
}
#[cfg(windows)]
@@ -148,11 +150,17 @@ fn run() -> Result<()> {
#[cfg(target_os = "macos")]
{
runner.execute(Step::Brew, "Brew (ARM)", || {
unix::run_brew(&ctx, unix::BrewVariant::MacArm)
runner.execute(Step::BrewFormula, "Brew (ARM)", || {
unix::run_brew_formula(&ctx, unix::BrewVariant::MacArm)
})?;
runner.execute(Step::Brew, "Brew (Intel)", || {
unix::run_brew(&ctx, unix::BrewVariant::MacIntel)
runner.execute(Step::BrewFormula, "Brew (Intel)", || {
unix::run_brew_formula(&ctx, unix::BrewVariant::MacIntel)
})?;
runner.execute(Step::BrewCask, "Brew Cask (ARM)", || {
unix::run_brew_cask(&ctx, unix::BrewVariant::MacArm)
})?;
runner.execute(Step::BrewCask, "Brew Cask (Intel)", || {
unix::run_brew_cask(&ctx, unix::BrewVariant::MacIntel)
})?;
runner.execute(Step::MacPorts, "MacPorts", || macos::run_macports(&ctx))?;
runner.execute(Step::MicrosoftAutoUpdate, "Microsoft AutoUpdate", || {