From 8a7af2e14d14d2344b10647a0978279c245fc39f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=BBP=2E=28P=20izzy=29?= <izder456@disroot.org>
Date: Sun, 13 Oct 2024 19:29:51 -0500
Subject: [PATCH]  [FIXES #922] properly check for -CURRENT in OpenBSD steps
 and pass the correct flags to the respective commands (#923)

* [FIXES #922] properly check for -CURRENT in openbsd steps and pass the correct flags

* un-break ctx.config().dry_run() on OpenBSD Step
---
 src/steps/os/openbsd.rs | 44 +++++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/steps/os/openbsd.rs b/src/steps/os/openbsd.rs
index 4630aba6..e51244d0 100644
--- a/src/steps/os/openbsd.rs
+++ b/src/steps/os/openbsd.rs
@@ -3,20 +3,46 @@ use crate::execution_context::ExecutionContext;
 use crate::terminal::print_separator;
 use crate::utils::{get_require_sudo_string, require_option};
 use color_eyre::eyre::Result;
+use rust_i18n::t;
+
+fn is_openbsd_current(ctx: &ExecutionContext) -> Result<bool> {
+    if ctx.config().dry_run() {
+        println!("Would check if OpenBSD is -current");
+        Ok(false) // Default to false for dry-run
+    } else {
+        let output = ctx.run_type().execute("uname").arg("-r").output_checked()?;
+
+        let version = String::from_utf8_lossy(&output.stdout);
+        Ok(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()
+
+    if ctx.config().dry_run() {
+        println!("Would update the OpenBSD system");
+        return Ok(());
+    }
+
+    let mut args = vec!["/usr/sbin/sysupgrade", "-n"];
+    if is_openbsd_current(ctx)? {
+        args.push("-s");
+    }
+
+    ctx.run_type().execute(sudo).args(&args).status_checked()
 }
 
 pub fn upgrade_packages(ctx: &ExecutionContext) -> Result<()> {
     let sudo = require_option(ctx.sudo().as_ref(), get_require_sudo_string())?;
     print_separator(t!("OpenBSD Packages"));
 
+    if ctx.config().dry_run() {
+        println!("Would update OpenBSD packages");
+        return Ok(());
+    }
+
     if ctx.config().cleanup() {
         ctx.run_type()
             .execute(sudo)
@@ -24,10 +50,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(ctx)? {
+        args.push("-Dsnap");
+    }
+
+    ctx.run_type().execute(sudo).args(&args).status_checked()?;
 
     Ok(())
 }