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

refactor: route sudo usage through Sudo::execute*

Browse Source
This commit is contained in:
Andre Toerien
2025-06-25 15:59:02 +02:00
committed by Gideon
parent 012a6bbde3
commit a95dd1e037
16 changed files with 303 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/steps/os/freebsd.rs
View File

@@ -2,26 +2,23 @@ use crate::command::CommandExt;
use crate::execution_context::ExecutionContext;
use crate::step::Step;
use crate::terminal::print_separator;
use crate::utils::{get_require_sudo_string, require_option};
use color_eyre::Result;
use rust_i18n::t;
use std::process::Command;
pub fn upgrade_freebsd(ctx: &ExecutionContext) -> Result<()> {
let sudo = require_option(ctx.sudo().as_ref(), get_require_sudo_string())?;
let sudo = ctx.require_sudo()?;
print_separator(t!("FreeBSD Update"));
ctx.execute(sudo)
.args(["/usr/sbin/freebsd-update", "fetch", "install"])
sudo.execute(ctx, "/usr/sbin/freebsd-update")?
.args(["fetch", "install"])
.status_checked()
}
pub fn upgrade_packages(ctx: &ExecutionContext) -> Result<()> {
let sudo = require_option(ctx.sudo().as_ref(), get_require_sudo_string())?;
let sudo = ctx.require_sudo()?;
print_separator(t!("FreeBSD Packages"));
let mut command = ctx.execute(sudo);
command.args(["/usr/sbin/pkg", "upgrade"]);
let mut command = sudo.execute(ctx, "/usr/sbin/pkg")?;
command.arg("upgrade");
if ctx.config().yes(Step::System) {
command.arg("-y");
}
@@ -29,12 +26,11 @@ pub fn upgrade_packages(ctx: &ExecutionContext) -> Result<()> {
}
pub fn audit_packages(ctx: &ExecutionContext) -> Result<()> {
let sudo = require_option(ctx.sudo().as_ref(), get_require_sudo_string())?;
let sudo = ctx.require_sudo()?;
print_separator(t!("FreeBSD Audit"));
Command::new(sudo)
.args(["/usr/sbin/pkg", "audit", "-Fr"])
.status_checked()?;
Ok(())
sudo.execute(ctx, "/usr/sbin/pkg")?
.args(["audit", "-Fr"])
.status_checked()
}