From 2b1d5fa46ffe7c9794fe8fc972040d722a35b17c Mon Sep 17 00:00:00 2001 From: Brian Ginsbach Date: Mon, 30 Mar 2020 14:09:28 -0500 Subject: [PATCH 1/2] Add NetBSD pkgsrc pkg_info to known binaries The NetBSD pkgsrc package management system uses pkg_info for determining information about packages. This is also the command used in PKGS-7302. --- include/binaries | 1 + 1 file changed, 1 insertion(+) diff --git a/include/binaries b/include/binaries index 16096fe4..5884fc0c 100644 --- a/include/binaries +++ b/include/binaries @@ -230,6 +230,7 @@ php) PHPBINARY="${BINARY}"; PHPVERSION=$(${BINARY} -v | awk '{ if ($1=="PHP") { print $2 }}' | head -1); LogText "Found known binary: php (programming language interpreter) - ${BINARY} (version ${PHPVERSION})" ;; pkg) PKG_BINARY="${BINARY}"; LogText " Found known binary: pkg (software package administration) - ${BINARY}" ;; pkg_admin) PKGADMINBINARY="${BINARY}"; LogText " Found known binary: pkg_admin (software package administration) - ${BINARY}" ;; + pkg_info) PKGINFOBINARY="${BINARY}"; LogText " Found known binary: pkg_info (software package information) - ${BINARY}" ;; postconf) POSTCONFBINARY="${BINARY}"; LogText " Found known binary: postconf (postfix configuration) - ${BINARY}" ;; postfix) POSTFIXBINARY="${BINARY}"; LogText " Found known binary: postfix (postfix binary) - ${BINARY}" ;; prelink) PRELINKBINARY="${BINARY}"; LogText " Found known binary: prelink (system optimizer) - ${BINARY}" ;; From eb7dbab1ee55f24a300b58ef845edc18d443f68a Mon Sep 17 00:00:00 2001 From: Brian Ginsbach Date: Mon, 30 Mar 2020 14:12:36 -0500 Subject: [PATCH 2/2] Add pkg_info to PackageIsInstalled The `pkg_info` command is used on a system using NetBSD pkgsrc to determine which packages are installed. --- include/functions | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/functions b/include/functions index ed1a58eb..5b60419f 100644 --- a/include/functions +++ b/include/functions @@ -2041,6 +2041,9 @@ elif [ -n "${PKG_BINARY}" ]; then output=$(${PKG_BINARY} -N info ${package} >/dev/null 2>&1) exit_code=$? # 0=package installed, 70=invalid package + elif [ -n "${PKGINFOBINARY}" ]; then + output=$(${PKGINFOBINARY} -q -e ${package} >/dev/null 2>&1) + exit_code=$? # 0=package installed, 1=package not installed elif [ -n "${RPMBINARY}" ]; then output=$(${RPMBINARY} --quiet -q ${package} > /dev/null 2>&1) exit_code=$?