From 21de7a20eb010716f3a3dd2671b5331697ff1057 Mon Sep 17 00:00:00 2001 From: Stephen Beaver Date: Thu, 15 Oct 2015 13:55:25 -0400 Subject: Removed debug Improved package detection --- src/usr/local/sbin/pfSense-upgrade | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade index b314e64..297e89f 100755 --- a/src/usr/local/sbin/pfSense-upgrade +++ b/src/usr/local/sbin/pfSense-upgrade @@ -551,12 +551,9 @@ pkg_delete() { pkg_reinstall_all() { for _pkg in $(pkg query -e '%a == 0' %n); do - case "${_pkg}" in - "${platform}"-pkg-* ) - echo reinstalling ${_pkg} - pkg_install ${_pkg} 1 - ;; - esac + if [ ${_pkg%-*} == "${platform}"-pkg ] ; then + pkg_install ${_pkg} 1 + fi done } @@ -691,7 +688,6 @@ case "${action}" in ;; install) if [ ${action_pkg} == "ALL_PACKAGES" ] && [ -n ${force} ]; then - echo "Reinstalling every single package" pkg_reinstall_all else pkg_install ${action_pkg} ${force} -- cgit v1.1