From fb6e0e107f78bafe79c10080b8ed262dd70a8c1d Mon Sep 17 00:00:00 2001
From: izder456 <izder456@disroot.org>
Date: Fri, 4 Oct 2024 12:48:54 -0500
Subject: [PATCH]  [FIXES #922] properly check for -CURRENT in openbsd steps
 and pass the correct flags

---
 src/steps/os/openbsd.rs | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/steps/os/openbsd.rs b/src/steps/os/openbsd.rs
index 4630aba6..f22f3b6f 100644
--- a/src/steps/os/openbsd.rs
+++ b/src/steps/os/openbsd.rs
@@ -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() {
+        args.push("-s");
+    }
+
+    ctx.run_type().execute(sudo).args(&args).status_checked()
 }
 
 pub fn upgrade_packages(ctx: &ExecutionContext) -> Result<()> {
@@ -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");
+    }
+
+    ctx.run_type().execute(sudo).args(&args).status_checked()?;
 
     Ok(())
 }