From 625f823f46e7b5b17862d5b0ca5bc230ad1203a2 Mon Sep 17 00:00:00 2001 From: SteveLauC Date: Sat, 27 May 2023 17:37:51 +0800 Subject: [PATCH] refactor: rename update fn name & some cleanup (#442) --- src/main.rs | 58 +++++++++++++++++++------------------------ src/steps/os/linux.rs | 4 +-- 2 files changed, 27 insertions(+), 35 deletions(-) diff --git a/src/main.rs b/src/main.rs index 62bfc95c..1463fa37 100644 --- a/src/main.rs +++ b/src/main.rs @@ -154,10 +154,14 @@ fn run() -> Result<()> { let should_run_powershell = powershell.profile().is_some() && config.should_run(Step::Powershell); #[cfg(windows)] - runner.execute(Step::Wsl, "WSL", || windows::run_wsl_topgrade(&ctx))?; - - #[cfg(windows)] - runner.execute(Step::WslUpdate, "WSL", || windows::update_wsl(&ctx))?; + { + runner.execute(Step::Wsl, "WSL", || windows::run_wsl_topgrade(&ctx))?; + runner.execute(Step::WslUpdate, "WSL", || windows::update_wsl(&ctx))?; + runner.execute(Step::Chocolatey, "Chocolatey", || windows::run_chocolatey(&ctx))?; + runner.execute(Step::Scoop, "Scoop", || windows::run_scoop(config.cleanup(), &ctx))?; + runner.execute(Step::Winget, "Winget", || windows::run_winget(&ctx))?; + runner.execute(Step::System, "Windows update", || windows::windows_update(&ctx))?; + } if let Some(topgrades) = config.remote_topgrades() { for remote_topgrade in topgrades.iter().filter(|t| config.should_execute_remote(t)) { @@ -192,13 +196,6 @@ fn run() -> Result<()> { })?; } - #[cfg(windows)] - { - runner.execute(Step::Chocolatey, "Chocolatey", || windows::run_chocolatey(&ctx))?; - runner.execute(Step::Scoop, "Scoop", || windows::run_scoop(config.cleanup(), &ctx))?; - runner.execute(Step::Winget, "Winget", || windows::run_winget(&ctx))?; - } - #[cfg(target_os = "macos")] { runner.execute(Step::BrewFormula, "Brew (ARM)", || { @@ -235,15 +232,25 @@ fn run() -> Result<()> { } #[cfg(target_os = "dragonfly")] - runner.execute(Step::Pkg, "DragonFly BSD Packages", || { - dragonfly::upgrade_packages(&ctx) - })?; + { + runner.execute(Step::Pkg, "DragonFly BSD Packages", || { + dragonfly::upgrade_packages(&ctx) + })?; + dragonfly::audit_packages(ctx.sudo().as_ref()).ok(); + } #[cfg(target_os = "freebsd")] - runner.execute(Step::Pkg, "FreeBSD Packages", || freebsd::upgrade_packages(&ctx))?; + { + runner.execute(Step::Pkg, "FreeBSD Packages", || freebsd::upgrade_packages(&ctx))?; + runner.execute(Step::System, "FreeBSD Upgrade", || freebsd::upgrade_freebsd(&ctx))?; + freebsd::audit_packages(ctx.sudo().as_ref()).ok(); + } #[cfg(target_os = "openbsd")] - runner.execute(Step::Pkg, "OpenBSD Packages", || openbsd::upgrade_packages(&ctx))?; + { + runner.execute(Step::Pkg, "OpenBSD Packages", || openbsd::upgrade_packages(&ctx))?; + runner.execute(Step::System, "OpenBSD Upgrade", || openbsd::upgrade_openbsd(&ctx))?; + } #[cfg(target_os = "android")] runner.execute(Step::Pkg, "Termux Packages", || android::upgrade_packages(&ctx))?; @@ -412,11 +419,11 @@ fn run() -> Result<()> { #[cfg(target_os = "linux")] { - runner.execute(Step::AM, "am", || linux::update_am(&ctx))?; + runner.execute(Step::AM, "am", || linux::run_am(&ctx))?; runner.execute(Step::AppMan, "appman", || linux::run_appman(&ctx))?; runner.execute(Step::DebGet, "deb-get", || linux::run_deb_get(&ctx))?; runner.execute(Step::Toolbx, "toolbx", || toolbx::run_toolbx(&ctx))?; - runner.execute(Step::Flatpak, "Flatpak", || linux::flatpak_update(&ctx))?; + runner.execute(Step::Flatpak, "Flatpak", || linux::run_flatpak(&ctx))?; runner.execute(Step::Snap, "snap", || linux::run_snap(&ctx))?; runner.execute(Step::Pacstall, "pacstall", || linux::run_pacstall(&ctx))?; runner.execute(Step::Pacdef, "pacdef", || linux::run_pacdef(&ctx))?; @@ -449,15 +456,6 @@ fn run() -> Result<()> { runner.execute(Step::System, "System upgrade", || macos::upgrade_macos(&ctx))?; } - #[cfg(target_os = "freebsd")] - runner.execute(Step::System, "FreeBSD Upgrade", || freebsd::upgrade_freebsd(&ctx))?; - - #[cfg(target_os = "openbsd")] - runner.execute(Step::System, "OpenBSD Upgrade", || openbsd::upgrade_openbsd(&ctx))?; - - #[cfg(windows)] - runner.execute(Step::System, "Windows update", || windows::windows_update(&ctx))?; - if config.should_run(Step::Vagrant) { if let Ok(boxes) = vagrant::collect_boxes(&ctx) { for vagrant_box in boxes { @@ -482,12 +480,6 @@ fn run() -> Result<()> { distribution.show_summary(); } } - - #[cfg(target_os = "freebsd")] - freebsd::audit_packages(ctx.sudo().as_ref()).ok(); - - #[cfg(target_os = "dragonfly")] - dragonfly::audit_packages(ctx.sudo().as_ref()).ok(); } let mut post_command_failed = false; diff --git a/src/steps/os/linux.rs b/src/steps/os/linux.rs index ac83a092..14018ca4 100644 --- a/src/steps/os/linux.rs +++ b/src/steps/os/linux.rs @@ -498,7 +498,7 @@ fn upgrade_solus(ctx: &ExecutionContext) -> Result<()> { Ok(()) } -pub fn update_am(ctx: &ExecutionContext) -> Result<()> { +pub fn run_am(ctx: &ExecutionContext) -> Result<()> { let am = require("am")?; if let Some(sudo) = ctx.sudo() { ctx.run_type().execute(sudo).arg(am).arg("-u").status_checked()?; @@ -722,7 +722,7 @@ pub fn run_fwupdmgr(ctx: &ExecutionContext) -> Result<()> { updmgr.status_checked_with_codes(&[2]) } -pub fn flatpak_update(ctx: &ExecutionContext) -> Result<()> { +pub fn run_flatpak(ctx: &ExecutionContext) -> Result<()> { let flatpak = require("flatpak")?; let sudo = require_option(ctx.sudo().as_ref(), String::from("sudo is not installed"))?; let cleanup = ctx.config().cleanup();