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

Add support for -y flag in Chocolatey (#457)

Browse Source
This commit is contained in:
Oleksii Filonenko
2020-06-30 11:55:39 +03:00
committed by GitHub
parent 33da94c818
commit d838eb588b
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.rs
View File

@@ -139,7 +139,7 @@ fn run() -> Result<()> {
#[cfg(windows)] #[cfg(windows)]
{ {
if config.should_run(Step::Chocolatey) { if config.should_run(Step::Chocolatey) {
runner.execute("Chocolatey", || windows::run_chocolatey(run_type))?; runner.execute("Chocolatey", || windows::run_chocolatey(&ctx))?;
} }
if config.should_run(Step::Scoop) { if config.should_run(Step::Scoop) {

14
src/steps/os/windows.rs
View File

@@ -7,11 +7,21 @@ use crate::utils::require;
use anyhow::Result; use anyhow::Result;
use std::process::Command; use std::process::Command;
pub fn run_chocolatey(run_type: RunType) -> Result<()> { pub fn run_chocolatey(ctx: &ExecutionContext) -> Result<()> {
let choco = require("choco")?; let choco = require("choco")?;
let yes = ctx.config().yes();
print_separator("Chocolatey"); print_separator("Chocolatey");
run_type.execute(&choco).args(&["upgrade", "all"]).check_run()
let mut command = ctx.run_type().execute(&choco);
command.args(&["upgrade", "all"]);
if yes {
command.arg("--yes");
}
command.check_run()
} }
pub fn run_scoop(cleanup: bool, run_type: RunType) -> Result<()> { pub fn run_scoop(cleanup: bool, run_type: RunType) -> Result<()> {