Module Name: src
Committed By: wiz
Date: Thu Sep 21 07:07:28 UTC 2017
Modified Files:
src/usr.bin/sys_info: sys_info.1 sys_info.sh
Log Message:
Sort options and their descriptions in man page and usage.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/sys_info/sys_info.1
cvs rdiff -u -r1.15 -r1.16 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.1
diff -u src/usr.bin/sys_info/sys_info.1:1.7 src/usr.bin/sys_info/sys_info.1:1.8
--- src/usr.bin/sys_info/sys_info.1:1.7 Thu Sep 21 01:15:45 2017
+++ src/usr.bin/sys_info/sys_info.1 Thu Sep 21 07:07:28 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: sys_info.1,v 1.7 2017/09/21 01:15:45 agc Exp $
+.\" $NetBSD: sys_info.1,v 1.8 2017/09/21 07:07:28 wiz Exp $
.\"
.\" Copyright (c) 2016 Alistair Crooks <[email protected]>
.\" All rights reserved.
@@ -31,10 +31,10 @@
.Nd script to show system version information
.Sh SYNOPSIS
.Nm
+.Op Fl v
+.Op Fl d Ar destination-dir
.Op Fl L Ar lib-path
.Op Fl P Ar path
-.Op Fl d Ar destination-dir
-.Op Fl v
.Op Ar component No ...
.Sh DESCRIPTION
The
@@ -49,6 +49,15 @@ information from the installed utilities
.Sh OPTIONS
The following options are available:
.Bl -tag -width inits
+.It Fl d
+This option provides a destination directory, used
+as the root directory of an alternative set of programs
+and libraries.
+This can be useful for finding versions of utilities
+and libraries rooted in the file system directory,
+such as the destination directory from a
+.Dv build.sh
+run.
.It Fl L
Give a list of directories
.Pq "colon separated"
@@ -67,15 +76,6 @@ via
is used.
To use the current value of $PATH from the caller, use:
.Dl -P \*q$PATH\*q
-.It Fl d
-This option provides a destination directory, used
-as the root directory of an alternative set of programs
-and libraries.
-This can be useful for finding versions of utilities
-and libraries rooted in the file system directory,
-such as the destination directory from a
-.Dv build.sh
-run.
.It Fl v
Show the commands used to obtain the version information
for each component
Index: src/usr.bin/sys_info/sys_info.sh
diff -u src/usr.bin/sys_info/sys_info.sh:1.15 src/usr.bin/sys_info/sys_info.sh:1.16
--- src/usr.bin/sys_info/sys_info.sh:1.15 Thu Sep 21 01:15:45 2017
+++ src/usr.bin/sys_info/sys_info.sh Thu Sep 21 07:07:28 2017
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: sys_info.sh,v 1.15 2017/09/21 01:15:45 agc Exp $
+# $NetBSD: sys_info.sh,v 1.16 2017/09/21 07:07:28 wiz Exp $
# Copyright (c) 2016 Alistair Crooks <[email protected]>
# All rights reserved.
@@ -251,7 +251,7 @@ while getopts "L:P:d:v" a; do
destdir=${OPTARG};;
v) verbose=true;;
\?) printf >&2 '%s\n' \
- "Usage: $0 [-P path] [-L libdirs] [-d destdir] [-v] [system...]"
+ "Usage: $0 [-v] [-d destdir] [-L libdirs] [-P path] [system...]"
exit 2
esac
done
