pre tag last fix, added -a to trigger --admin, that makes it easier

for forum output, like: inxi -Fxxxaz
This commit is contained in:
Harald Hope 2018-09-07 17:03:27 -07:00
parent e78e37a1e1
commit e08d828056
3 changed files with 11 additions and 9 deletions

4
inxi
View file

@ -3726,7 +3726,7 @@ sub get_options{
my ($b_downloader,$b_help,$b_no_man,$b_no_man_force,$b_recommends,$b_updater,$b_version, my ($b_downloader,$b_help,$b_no_man,$b_no_man_force,$b_recommends,$b_updater,$b_version,
$b_use_man,$self_download, $download_id); $b_use_man,$self_download, $download_id);
GetOptions ( GetOptions (
'admin' => sub { 'a|admin' => sub {
$b_admin = 1;}, $b_admin = 1;},
'A|audio' => sub { 'A|audio' => sub {
$show{'short'} = 0; $show{'short'} = 0;
@ -4520,7 +4520,7 @@ sub show_options {
push @data, @rows; push @data, @rows;
} }
@rows = ( @rows = (
['1', '', '--admin', "Adds advanced sys admin data (only works with ['1', '-a', '--admin', "Adds advanced sys admin data (only works with
verbose or line output, not short form):" ], verbose or line output, not short form):" ],
['2', '-C', '', "If available: CPU vulnerabilities (bugs); family, model-id, stepping - format: ['2', '-C', '', "If available: CPU vulnerabilities (bugs); family, model-id, stepping - format:
hex (decimal) if greater than 9, otherwise hex; microcode - format: hex." ], hex (decimal) if greater than 9, otherwise hex; microcode - format: hex." ],

9
inxi.1
View file

@ -12,7 +12,7 @@ inxi \- Command line system information script for console and IRC
\fBinxi\fR [\fB\-\-recommends\fR] \fR[\fB\-\-slots\fR] \fR[\fB\-\-usb\fR] \fBinxi\fR [\fB\-\-recommends\fR] \fR[\fB\-\-slots\fR] \fR[\fB\-\-usb\fR]
\fBinxi\fB [\-x\fR|\fB\-xx\fR|\fB\-xxx\fR|\-\-admin] \fB\-OPTION(s) \fR \fBinxi\fB [\fB\-x\fR|\fB\-xx\fR|\fB\-xxx\fR|\fB\-a\fR|\fB\-\-admin\fR] \fB\-OPTION(s)\fR
All options have long form variants \- see below for these and more advanced options. All options have long form variants \- see below for these and more advanced options.
@ -810,11 +810,12 @@ lxpanel, xfce4\-panel, lxqt\-panel, tint2, cairo-dock, trayer, and many others.
\- Adds location (city state country), altitude, weather observation time. \- Adds location (city state country), altitude, weather observation time.
.SH ADMIN EXTRA DATA OPTIONS .SH ADMIN EXTRA DATA OPTIONS
These options are triggered with \fB\-\-admin\fR. Admin options are advanced output options, These options are triggered with \fB\-\-admin\fR or \fB\-a\fR. Admin options are
and are more technical, and mostly of interest to system administrators or other machine admins. advanced output options, and are more technical, and mostly of interest to system
administrators or other machine admins.
The \fB\-\-admin\fR option only has to be used once, and will trigger the following features. The \fB\-\-admin\fR option only has to be used once, and will trigger the following features.
.TP .TP
.B \-\-admin \-C\fR .B \-a \-C\fR
\- Adds CPU family, model\-id, and stepping (replaces \fBrev\fR of \fB\-Cx\fR). \- Adds CPU family, model\-id, and stepping (replaces \fBrev\fR of \fB\-Cx\fR).
Format is \fBhexadecimal (decimal)\fR if greater than 9, otherwise \fBhexadecimal\fR. Format is \fBhexadecimal (decimal)\fR if greater than 9, otherwise \fBhexadecimal\fR.

View file

@ -39,17 +39,18 @@ correct anoymous debugger dataset report from rakasunka.
Enhancements: Enhancements:
1. Added --admin to -v 8 and to --debugger 2x 1. Added --admin to -v 8 and to --debugger 2x
2. Expanded system base to use Debian version tool, like the ubuntu one, that 2. Added -a to trigger --admin. This lets you run something like -Fxxxaz
3. Expanded system base to use Debian version tool, like the ubuntu one, that
lets me match version number to codename. The ubuntu one matches code names to lets me match version number to codename. The ubuntu one matches code names to
release dates. Added Neptune, PureOS, Sparky, Tails, to new Debian system base release dates. Added Neptune, PureOS, Sparky, Tails, to new Debian system base
handler. handler.
3. Big enhancement: --admin -C now shows a nice report on cpu vulnerabilities, 4. Big enhancement: --admin -C now shows a nice report on cpu vulnerabilities,
and has a good error message if no data found. Report shows: and has a good error message if no data found. Report shows:
Vulnerabilities: Type: [e.g. meltdown] status/mitigation: text explanation. Vulnerabilities: Type: [e.g. meltdown] status/mitigation: text explanation.
Note: 'status' is for when no mitigation, either not applicable, or is vulnerable. Note: 'status' is for when no mitigation, either not applicable, or is vulnerable.
'mitigation' is when it's handled, and how. Thanks issue #160 Vascom from Fedora 'mitigation' is when it's handled, and how. Thanks issue #160 Vascom from Fedora
for that request. for that request.
4. The never-ending saga of disk vendor IDs continues. More obscure vendors, 5. The never-ending saga of disk vendor IDs continues. More obscure vendors,
more matches to existing vendors. Thanks linuxlite/linux hardware database more matches to existing vendors. Thanks linuxlite/linux hardware database
Changes: Changes: