Module Name: src
Committed By: reed
Date: Tue Jul 14 01:01:05 UTC 2020
Modified Files:
src/usr.bin/sys_info: sys_info.sh
Log Message:
show the verbose commands for bozohttpd and calendar too
And bump the version.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/sys_info/sys_info.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/sys_info/sys_info.sh
diff -u src/usr.bin/sys_info/sys_info.sh:1.17 src/usr.bin/sys_info/sys_info.sh:1.18
--- src/usr.bin/sys_info/sys_info.sh:1.17 Thu Sep 28 18:08:04 2017
+++ src/usr.bin/sys_info/sys_info.sh Tue Jul 14 01:01:05 2020
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: sys_info.sh,v 1.17 2017/09/28 18:08:04 agc Exp $
+# $NetBSD: sys_info.sh,v 1.18 2020/07/14 01:01:05 reed Exp $
# Copyright (c) 2016 Alistair Crooks <a...@netbsd.org>
# All rights reserved.
@@ -26,7 +26,7 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-SYS_INFO_VERSION=20170928
+SYS_INFO_VERSION=20200714
PATH=$(sysctl -n user.cs_path)
export PATH
@@ -110,7 +110,7 @@ getversion() {
run "named -v | awk '{ gsub(\"-\", \"\", \$2); gsub(\"P\", \"pl\", \$2); print tolower(\$1) \"-\" \$2 }'"
$all || return 0 ;&
bozohttpd|httpd)
- v=$(run "${destdir}/usr/libexec/httpd -G" 2>/dev/null)
+ v=$(run "${destdir}/usr/libexec/httpd -G")
case "${v}" in
"")
run "strings -a ${destdir}/usr/libexec/httpd | awk -F/ '\$1 == \"bozohttpd\" && NF == 2 { print \$1 \"-\" \$2; exit }'"
@@ -124,7 +124,7 @@ getversion() {
run "bzip2 --help 2>&1 | awk '{ sub(\",\", \"\", \$7); print \"bzip2-\" \$7; exit }'"
$all || return 0 ;&
calendar)
- v=$(run "calendar -v" 2>/dev/null || true)
+ v=$(run "calendar -v" || true)
case "${v}" in
"") printf '%s\n' "calendar-20150701" ;;
*) printf '%s\n' "${v}" ;;
