diff options
author | Renato Botelho <renato@netgate.com> | 2015-11-05 16:10:01 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-11-05 16:10:01 -0200 |
commit | d6f92b70c0277c8c4e861159eedd46e640162407 (patch) | |
tree | b942ed759d0dfcebcebd0b1c28dd5dfd4e6dfbd3 /src/usr/local/sbin | |
parent | e8ef8dd8b24e5e934911288645f09a9b5955cd06 (diff) | |
download | pfsense-d6f92b70c0277c8c4e861159eedd46e640162407.zip pfsense-d6f92b70c0277c8c4e861159eedd46e640162407.tar.gz |
Do not consider only meta package, but also other pfSense main packages, also change exit code from -1 to 2
Diffstat (limited to 'src/usr/local/sbin')
-rwxr-xr-x | src/usr/local/sbin/pfSense-upgrade | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade index fbf6e59..eeee2b8 100755 --- a/src/usr/local/sbin/pfSense-upgrade +++ b/src/usr/local/sbin/pfSense-upgrade @@ -423,12 +423,25 @@ check_upgrade() { pkg_update if [ "$(compare_pkg_version ${_meta_pkg})" = "<" ]; then - _echo "A new ${product} version is available" - _exit -1 + local _new_version=$(pkg rquery %v ${_meta_pkg}) + _echo "${_new_version} version of ${product} is available" + _exit 2 else - _echo "Your system is up to date" - _exit 0 + for _pkg in $(pkg query -e "%n ~ ${product}-*" %n); do + # Ignore additional packages + if echo "${_pkg}" | grep -q "^${pkg_prefix}"; then + continue + fi + if [ "$(compare_pkg_version ${_pkg})" = "<" ]; then + local _new_version=$(pkg rquery %v ${_pkg}) + _echo "${_new_version} version of ${_pkg} is available" + _exit 2 + fi + done fi + + _echo "Your system is up to date" + _exit 0 } setup_nanobsd_env() { |