Module Name: othersrc
Committed By: agc
Date: Thu Jun 2 02:54:57 UTC 2016
Modified Files:
othersrc/external/bsd/sys_info: sys_info.sh
Log Message:
be sure to show the names of bozohttpd and calendar, as well as the versions
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 othersrc/external/bsd/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: othersrc/external/bsd/sys_info/sys_info.sh
diff -u othersrc/external/bsd/sys_info/sys_info.sh:1.1 othersrc/external/bsd/sys_info/sys_info.sh:1.2
--- othersrc/external/bsd/sys_info/sys_info.sh:1.1 Thu Jun 2 02:47:56 2016
+++ othersrc/external/bsd/sys_info/sys_info.sh Thu Jun 2 02:54:57 2016
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: sys_info.sh,v 1.1 2016/06/02 02:47:56 agc Exp $
+# $NetBSD: sys_info.sh,v 1.2 2016/06/02 02:54:57 agc Exp $
# Copyright (c) 2016 Alistair Crooks <[email protected]>
# All rights reserved.
@@ -43,7 +43,7 @@ getversion() {
calendar)
v=$(calendar -v 2>/dev/null || true)
case "${v}" in
- "") echo "20150701" ;;
+ "") echo "calendar-20150701" ;;
*) echo ${v} ;;
esac
;;
@@ -69,7 +69,7 @@ getversion() {
strings -a /usr/libexec/httpd | awk -F/ '$1 == "bozohttpd" && NF == 2 { print $1 "-" $2; exit }'
;;
*)
- echo ${v##*/}
+ echo bozohttpd-${v##*/}
;;
esac
;;
