From 04a8d960a93c142b5a6beb3c343b333be0ec00a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Sch=C3=B6nauer?=
 <37108907+DottoDev@users.noreply.github.com>
Date: Tue, 15 Nov 2022 17:09:14 +0100
Subject: [PATCH] Revert " Fix unattended package upgrades on FreeBSD" (#188)

Revert " Fix unattended package upgrades on FreeBSD (#181)"

This reverts commit a0ad83a58b309b756b8f1ff6f8ca507932c1249b.
---
 src/main.rs             |  2 +-
 src/steps/os/freebsd.rs | 17 +++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index a5475ea6..d3964f1b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -210,7 +210,7 @@ fn run() -> Result<()> {
 
     #[cfg(target_os = "freebsd")]
     runner.execute(Step::Pkg, "FreeBSD Packages", || {
-        freebsd::upgrade_packages(&ctx, sudo.as_ref(), run_type)
+        freebsd::upgrade_packages(sudo.as_ref(), run_type)
     })?;
 
     #[cfg(target_os = "openbsd")]
diff --git a/src/steps/os/freebsd.rs b/src/steps/os/freebsd.rs
index fd1bdeeb..2c57b77c 100644
--- a/src/steps/os/freebsd.rs
+++ b/src/steps/os/freebsd.rs
@@ -5,8 +5,6 @@ use crate::utils::require_option;
 use color_eyre::eyre::Result;
 use std::path::PathBuf;
 use std::process::Command;
-use crate::config::{Step};
-use crate::execution_context::ExecutionContext;
 
 pub fn upgrade_freebsd(sudo: Option<&PathBuf>, run_type: RunType) -> Result<()> {
     let sudo = require_option(sudo, String::from("No sudo detected"))?;
@@ -17,18 +15,13 @@ pub fn upgrade_freebsd(sudo: Option<&PathBuf>, run_type: RunType) -> Result<()>
         .status_checked()
 }
 
-pub fn upgrade_packages(ctx: &ExecutionContext, sudo: Option<&PathBuf>, run_type: RunType) -> Result<()> {
+pub fn upgrade_packages(sudo: Option<&PathBuf>, run_type: RunType) -> Result<()> {
     let sudo = require_option(sudo, String::from("No sudo detected"))?;
     print_separator("FreeBSD Packages");
-    let mut command = run_type.execute(sudo);
-
-    command.args(&["/usr/sbin/pkg", "upgrade"]);
-
-    if ctx.config().yes(Step::System) {
-        command.arg("-y");
-    }
-
-    command.check_run()
+    run_type
+        .execute(sudo)
+        .args(["/usr/sbin/pkg", "upgrade"])
+        .status_checked()
 }
 
 pub fn audit_packages(sudo: &Option<PathBuf>) -> Result<()> {