diff options
| author | agc <agc@NetBSD.org> | 2017-08-23 18:15:53 +0000 |
|---|---|---|
| committer | agc <agc@NetBSD.org> | 2017-08-23 18:15:53 +0000 |
| commit | 4f6fbfcdd29f83d7eedb7bb3dda9a7bb23cf2ef4 (patch) | |
| tree | c844541f62429e421217ad24df17ff30af356eae | |
| parent | 4b02e493b8617f2bdb4df71c20c4543500d8d164 (diff) | |
add pkg_install to the list of programs reported
don't throw a warning if tcsh is not found in the path
| -rw-r--r-- | usr.bin/sys_info/sys_info.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/usr.bin/sys_info/sys_info.sh b/usr.bin/sys_info/sys_info.sh index e6f14060104..8cf7a37e1bf 100644 --- a/usr.bin/sys_info/sys_info.sh +++ b/usr.bin/sys_info/sys_info.sh @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: sys_info.sh,v 1.8 2017/08/23 01:17:46 kre Exp $ +# $NetBSD: sys_info.sh,v 1.9 2017/08/23 18:15:53 agc Exp $ # Copyright (c) 2016 Alistair Crooks <agc@NetBSD.org> # All rights reserved. @@ -26,7 +26,7 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SYS_INFO_VERSION=$( D="\$Date: 2017/08/23 01:17:46 $"; set -f; +SYS_INFO_VERSION=$( D="\$Date: 2017/08/23 18:15:53 $"; set -f; IFS=" /"; set -- $D; printf %s "$2$3$4" ) PATH=$(sysctl -n user.cs_path) @@ -186,6 +186,11 @@ getversion() { openssl) run "openssl version 2>/dev/null | awk '{ print tolower(\$1) \"-\" \$2 }'" $all || return 0 ;& + pkg_info|pkg_install) + if which_prog infopath pkg_info; then + run "printf 'pkg_install-%s\n' $(${infopath} -V)" + fi + $all || return 0 ;& sh) run "set -- \$NETBSD_SHELL; case \"\$1+\$2\" in *+BUILD*) ;; +) set -- ancient;; *) set -- \"\$1\";;esac; printf 'sh-%s\\n' \$1\${2:+-\${2#BUILD:}}" $all || return 0 ;& @@ -198,8 +203,6 @@ getversion() { tcsh) if which_prog tcshpath tcsh; then run "${tcshpath} --version | awk '{ print \$1 \"-\" \$2 }'" - else - $all || printf >&2 '%s\n' "tcsh: not found" fi $all || return 0 ;& tzdata) |
