From aecade14d0f91084253488ffe9afa99089e7c8d3 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Mon, 1 Feb 2016 10:20:39 -0200
Subject: Make additional packages install/delete operations to respect -n
 (dry-run)

---
 src/usr/local/sbin/pfSense-upgrade | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/usr')

diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade
index bef7f33..3143bc5 100755
--- a/src/usr/local/sbin/pfSense-upgrade
+++ b/src/usr/local/sbin/pfSense-upgrade
@@ -618,7 +618,7 @@ pkg_install() {
 		local _msg="Installing"
 	fi
 
-	_exec "pkg_with_pb ${_cmd} ${_pkg_name}" "${_msg} ${_pkg_name}"
+	_exec "pkg_with_pb ${_cmd}${dry_run:+ }${dry_run} ${_pkg_name}" "${_msg} ${_pkg_name}"
 	_exec "pkg clean" "Cleaning up cache" mute ignore_result
 }
 
@@ -646,7 +646,7 @@ pkg_delete() {
 		_exit 1
 	fi
 
-	_exec "pkg_with_pb delete ${_pkg_name}" "Removing ${_pkg_name}"
+	_exec "pkg_with_pb delete${dry_run:+ }${dry_run} ${_pkg_name}" "Removing ${_pkg_name}"
 	_exec "pkg autoremove" "Removing stale packages" mute ignore_result
 }
 
@@ -773,7 +773,7 @@ while getopts 46b:cdfi:hp:l:nr:Ruy opt; do
 			fi
 			;;
 		n)
-			dry_run=1
+			dry_run="-n"
 			;;
 		p)
 			progress_socket="${OPTARG}"
-- 
cgit v1.1