From 0fd71e83bcd2e00aac489ad76a71b38cda9dfc6b Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Fri, 16 Sep 2016 16:23:53 -0300 Subject: Make pkg_lock() and pkg_unlock() work with wildcards --- src/usr/local/sbin/pfSense-upgrade | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'src/usr/local/sbin') diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade index 478e409..0fdb326 100755 --- a/src/usr/local/sbin/pfSense-upgrade +++ b/src/usr/local/sbin/pfSense-upgrade @@ -226,27 +226,33 @@ fetch_upgrade_packages() { } pkg_lock() { - local _pkg="${1}" + local _pkgs="${1}" - if [ -z "${_pkg}" ]; then + if [ -z "${_pkgs}" ]; then return fi - if [ "$(pkg ${pkg_chroot} query %k ${_pkg})" = "0" ]; then - _exec "pkg ${pkg_chroot} lock ${_pkg}" "Locking package ${_pkg}" mute - fi + for _pkg in $(pkg query -g %n "${_pkgs}"); do + if [ "$(pkg ${pkg_chroot} query %k ${_pkg})" = "0" ]; then + _exec "pkg ${pkg_chroot} lock ${_pkg}" \ + "Locking package ${_pkg}" mute + fi + done } pkg_unlock() { - local _pkg="${1}" + local _pkgs="${1}" - if [ -z "${_pkg}" ]; then + if [ -z "${_pkgs}" ]; then return fi - if [ "$(pkg ${pkg_chroot} query %k ${_pkg})" = "1" ]; then - _exec "pkg ${pkg_chroot} unlock ${_pkg}" "Unlocking package ${_pkg}" mute - fi + for _pkg in $(pkg query -g %n "${_pkgs}"); do + if [ "$(pkg ${pkg_chroot} query %k ${_pkg})" = "1" ]; then + _exec "pkg ${pkg_chroot} unlock ${_pkg}" \ + "Unlocking package ${_pkg}" mute + fi + done } pkg_update() { -- cgit v1.1