summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-02-01 10:20:39 -0200
committerRenato Botelho <renato@netgate.com>2016-02-01 10:20:39 -0200
commitaecade14d0f91084253488ffe9afa99089e7c8d3 (patch)
tree3337b3c81cc2928b1ad440ef306c74e420a3aaf7 /src
parent2b29a7e28555b6c48b9e3d4504e1efdc51a8933a (diff)
downloadpfsense-aecade14d0f91084253488ffe9afa99089e7c8d3.zip
pfsense-aecade14d0f91084253488ffe9afa99089e7c8d3.tar.gz
Make additional packages install/delete operations to respect -n (dry-run)
Diffstat (limited to 'src')
-rwxr-xr-xsrc/usr/local/sbin/pfSense-upgrade6
1 files changed, 3 insertions, 3 deletions
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}"
OpenPOWER on IntegriCloud