Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIXES #922] properly check for -CURRENT in OpenBSD steps and pass the correct flags to the respective commands #923

Merged
merged 3 commits into from
Oct 14, 2024
Merged

[FIXES #922] properly check for -CURRENT in OpenBSD steps and pass the correct flags to the respective commands #923

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f95672a
[FIXES #922] properly check for -CURRENT in openbsd steps and pass t…
Izder456 Oct 4, 2024
c8860f9
Merge branch 'topgrade-rs:main' into main
Izder456 Oct 13, 2024
ef3d14c
un-break ctx.config().dry_run() on OpenBSD Step
Izder456 Oct 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 25 additions & 8 deletions src/steps/os/openbsd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,31 @@
use crate::command::CommandExt;
use crate::execution_context::ExecutionContext;
use crate::t;
use crate::terminal::print_separator;
use crate::utils::{get_require_sudo_string, require_option};
use color_eyre::eyre::Result;
use std::process::Command;

fn is_openbsd_current() -> bool {
let output = Command::new("uname")
.arg("-r")
.output()
.expect("Failed to execute uname command");

let version = String::from_utf8_lossy(&output.stdout);
version.trim().ends_with("-current")
}

pub fn upgrade_openbsd(ctx: &ExecutionContext) -> Result<()> {
let sudo = require_option(ctx.sudo().as_ref(), get_require_sudo_string())?;
print_separator(t!("OpenBSD Update"));
ctx.run_type()
.execute(sudo)
.args(["/usr/sbin/sysupgrade", "-n"])
.status_checked()

let mut args = vec!["/usr/sbin/sysupgrade", "-n"];
if is_openbsd_current() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function uses std::process::Command and Topgrade's dry-run option does not work with it, and thus this PR breaks the dry-run option.

We should use ctx.run_type().execute() instead, though I kinda think it won't work either. 😮‍💨

I guess we should skip all the update procedures and print something like "will update the system package" if this is a dry run(ctx has a dry_run() function to check if the current run is a dry-run or not)

args.push("-s");
}

ctx.run_type().execute(sudo).args(&args).status_checked()
}

pub fn upgrade_packages(ctx: &ExecutionContext) -> Result<()> {
Expand All @@ -24,10 +39,12 @@ pub fn upgrade_packages(ctx: &ExecutionContext) -> Result<()> {
.status_checked()?;
}

ctx.run_type()
.execute(sudo)
.args(["/usr/sbin/pkg_add", "-u"])
.status_checked()?;
let mut args = vec!["/usr/sbin/pkg_add", "-u"];
if is_openbsd_current() {
args.push("-Dsnap");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

}

ctx.run_type().execute(sudo).args(&args).status_checked()?;

Ok(())
}
Loading