ncc.zabbix_fbsd_templates

     1.1 --- a/src/aw.fbsd-mon-helper/lib/pkg.sh	Thu Oct 17 22:38:18 2024 +0300
     1.2 +++ b/src/aw.fbsd-mon-helper/lib/pkg.sh	Thu Oct 17 22:58:24 2024 +0300
     1.3 @@ -21,12 +21,12 @@
     1.4  }
     1.5  
     1.6  pkg_get_detail_pkg_list () {
     1.7 -  local vl_pkg_fullname
     1.8 +  local vl_pkg_name
     1.9    local vl_buf
    1.10  
    1.11    cat "${USER_MON_PKG_LIST}" | while read vl_buf; do
    1.12 -    vl_pkg_fullname=$(pkg query '%n-%v' "${vl_buf}")
    1.13 -    [ -n "${vl_pkg_fullname}" ] && echo "${vl_pkg_fullname}" >> "${v_pkg_detail_status_list}"
    1.14 +    vl_pkg_name=$(pkg query '%n' "${vl_buf}")
    1.15 +    [ -n "${vl_pkg_fullname}" ] && echo "${vl_pkg_name}" >> "${v_pkg_detail_status_list}"
    1.16    done
    1.17  
    1.18    service -e | awk '$1 ~ "^/usr/local" {print $1}' | while read vl_buf; do
    1.19 @@ -34,22 +34,25 @@
    1.20        continue
    1.21      fi
    1.22  
    1.23 -    vl_pkg_fullname="$(pkg which "$vl_buf" | awk '$0 ~ "was installed by package" {print $6}')"
    1.24 +    vl_pkg_name="$(pkg which "$vl_buf" | awk '$0 ~ "was installed by package" {print $6}')"
    1.25  
    1.26 -    if [ -z "$vl_pkg_fullname" ] ; then
    1.27 +    if [ -z "$vl_pkg_name" ] ; then
    1.28        log "$vl_buf have no matched pkg"
    1.29        continue
    1.30      fi
    1.31  
    1.32 +    vl_pkg_name="$(pkg query '%n' "$vl_pkg_name")"
    1.33 +
    1.34      {
    1.35 -      echo "${vl_pkg_fullname}"
    1.36 -      pkg query '%rn' "${vl_pkg_fullname}"
    1.37 -      pkg query '%dn' "${vl_pkg_fullname}"
    1.38 +      echo "${vl_pkg_name}"
    1.39 +      pkg query '%rn' "${vl_pkg_name}"
    1.40 +      pkg query '%dn' "${vl_pkg_name}"
    1.41      } >> "${v_pkg_detail_status_list}"
    1.42    done
    1.43  }
    1.44  
    1.45  pkg_make_detail () {
    1.46 +  local vl_pkg_buf
    1.47    local vl_pkg_fullname
    1.48    local vl_pkg_repo
    1.49    local vl_pkg_name
    1.50 @@ -58,9 +61,10 @@
    1.51    local vl_pkg_status
    1.52  
    1.53    pkg_get_detail_pkg_list
    1.54 -  cat "${v_pkg_detail_status_list}" | sort | uniq | while read vl_pkg_fullname; do
    1.55 -    log "Working with $vl_pkg_fullname"
    1.56 +  cat "${v_pkg_detail_status_list}" | sort | uniq | while read vl_pkg_buf; do
    1.57 +    log "Working with $vl_pkg_buf"
    1.58  
    1.59 +    vl_pkg_fullname="$(pkg query '%n-%v' "${vl_pkg_buf}")"
    1.60      vl_pkg_name="$(pkg query '%n' "$vl_pkg_fullname")"
    1.61      vl_pkg_repo="$(pkg query '%R' "$vl_pkg_fullname")"
    1.62      vl_pkg_ver="$(pkg query '%v' "$vl_pkg_fullname")"