refactor: make update fn take &ExectionContext & put update fn together (#457)

This commit is contained in:
SteveLauC
2023-06-03 04:20:42 +08:00
committed by GitHub
parent a0ff565220
commit 658829e4ff
5 changed files with 157 additions and 174 deletions

View File

@@ -1,6 +1,5 @@
use crate::command::CommandExt;
use crate::execution_context::ExecutionContext;
use crate::sudo::Sudo;
use crate::terminal::print_separator;
use crate::utils::require_option;
use color_eyre::eyre::Result;
@@ -14,8 +13,8 @@ pub fn upgrade_packages(ctx: &ExecutionContext) -> Result<()> {
.status_checked()
}
pub fn audit_packages(sudo: Option<&Sudo>) -> Result<()> {
if let Some(sudo) = sudo {
pub fn audit_packages(ctx: &ExecutionContext) -> Result<()> {
if let Some(sudo) = ctx.sudo() {
println!();
Command::new(sudo)
.args(["/usr/local/sbin/pkg", "audit", "-Fr"])

View File

@@ -1,6 +1,5 @@
use crate::command::CommandExt;
use crate::execution_context::ExecutionContext;
use crate::sudo::Sudo;
use crate::terminal::print_separator;
use crate::utils::require_option;
use crate::Step;
@@ -29,8 +28,8 @@ pub fn upgrade_packages(ctx: &ExecutionContext) -> Result<()> {
command.status_checked()
}
pub fn audit_packages(sudo: Option<&Sudo>) -> Result<()> {
if let Some(sudo) = sudo {
pub fn audit_packages(ctx: &ExecutionContext) -> Result<()> {
if let Some(sudo) = ctx.sudo() {
println!();
Command::new(sudo)
.args(["/usr/sbin/pkg", "audit", "-Fr"])

View File

@@ -460,7 +460,7 @@ pub fn run_pearl(ctx: &ExecutionContext) -> Result<()> {
ctx.run_type().execute(pearl).arg("update").status_checked()
}
pub fn run_sdkman(cleanup: bool, ctx: &ExecutionContext) -> Result<()> {
pub fn run_sdkman(ctx: &ExecutionContext) -> Result<()> {
let bash = require("bash")?;
let sdkman_init_path = var("SDKMAN_DIR")
@@ -506,7 +506,7 @@ pub fn run_sdkman(cleanup: bool, ctx: &ExecutionContext) -> Result<()> {
.args(["-c", cmd_upgrade.as_str()])
.status_checked()?;
if cleanup {
if ctx.config().cleanup() {
let cmd_flush_archives = format!("source {} && sdk flush archives", &sdkman_init_path);
ctx.run_type()
.execute(&bash)

View File

@@ -53,7 +53,7 @@ pub fn run_winget(ctx: &ExecutionContext) -> Result<()> {
.status_checked()
}
pub fn run_scoop(cleanup: bool, ctx: &ExecutionContext) -> Result<()> {
pub fn run_scoop(ctx: &ExecutionContext) -> Result<()> {
let scoop = require("scoop")?;
print_separator("Scoop");
@@ -61,7 +61,7 @@ pub fn run_scoop(cleanup: bool, ctx: &ExecutionContext) -> Result<()> {
ctx.run_type().execute(&scoop).args(["update"]).status_checked()?;
ctx.run_type().execute(&scoop).args(["update", "*"]).status_checked()?;
if cleanup {
if ctx.config().cleanup() {
ctx.run_type().execute(&scoop).args(["cleanup", "*"]).status_checked()?;
}