From e80bd05550b6c140ff648c59e181d2b4ecb9a360 Mon Sep 17 00:00:00 2001
From: izder456 <izder456@disroot.org>
Date: Tue, 15 Oct 2024 20:02:37 -0500
Subject: [PATCH] Improve OpenBSD -CURRENT detection and Dry-run feedback

This commit improves the -CURRENT detection by way of parsing `/etc/motd`. This change is more future-proof as when OpenBSD nears a stable release, `uname` will temporarily report like -STABLE.

This commit *also* adds feedback if -CURRENT is found to make debugging this feature easier with `--dry-run`, or, just a regular run as well.
---
 src/steps/os/openbsd.rs | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/steps/os/openbsd.rs b/src/steps/os/openbsd.rs
index e51244d0..b7699b3d 100644
--- a/src/steps/os/openbsd.rs
+++ b/src/steps/os/openbsd.rs
@@ -4,16 +4,16 @@ use crate::terminal::print_separator;
 use crate::utils::{get_require_sudo_string, require_option};
 use color_eyre::eyre::Result;
 use rust_i18n::t;
+use std::fs;
 
 fn is_openbsd_current(ctx: &ExecutionContext) -> Result<bool> {
+    let motd_content = fs::read_to_string("/etc/motd")?;
+    let is_current = motd_content.contains("-current");
     if ctx.config().dry_run() {
         println!("Would check if OpenBSD is -current");
-        Ok(false) // Default to false for dry-run
+        Ok(is_current)
     } 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"))
+        Ok(is_current)
     }
 }
 
@@ -21,13 +21,19 @@ pub fn upgrade_openbsd(ctx: &ExecutionContext) -> Result<()> {
     let sudo = require_option(ctx.sudo().as_ref(), get_require_sudo_string())?;
     print_separator(t!("OpenBSD Update"));
 
+    let is_current = is_openbsd_current(ctx)?;
+
     if ctx.config().dry_run() {
         println!("Would update the OpenBSD system");
+        if is_current {
+            println!("Would use -s flag when upgrading system");
+        }
         return Ok(());
     }
 
     let mut args = vec!["/usr/sbin/sysupgrade", "-n"];
-    if is_openbsd_current(ctx)? {
+    if is_current {
+        println!("OpenBSD is running -current, passing -s flag");
         args.push("-s");
     }
 
@@ -38,8 +44,13 @@ pub fn upgrade_packages(ctx: &ExecutionContext) -> Result<()> {
     let sudo = require_option(ctx.sudo().as_ref(), get_require_sudo_string())?;
     print_separator(t!("OpenBSD Packages"));
 
+    let is_current = is_openbsd_current(ctx)?;
+
     if ctx.config().dry_run() {
         println!("Would update OpenBSD packages");
+        if is_current {
+            println!("Would use -Dsnap flag when upgrading packages");
+        }
         return Ok(());
     }
 
@@ -51,7 +62,8 @@ pub fn upgrade_packages(ctx: &ExecutionContext) -> Result<()> {
     }
 
     let mut args = vec!["/usr/sbin/pkg_add", "-u"];
-    if is_openbsd_current(ctx)? {
+    if is_current {
+        println!("OpenBSD is running -current, passing -Dsnap flag");
         args.push("-Dsnap");
     }