redid patches, I think

This commit is contained in:
Harald Hope 2021-08-24 20:39:33 -07:00
parent b737838957
commit 73d9643907
3 changed files with 27 additions and 27 deletions

View file

@ -107,7 +107,7 @@ wget -O inxi https://smxi.org/inxi
wget -O inxi smxi.org/inxi
NOTE: Just because github calls tagged commits 'Releases' does not mean they are
releases! I can't change the words on the tag page. They are tagged commmits,
releases! I can't change the words on the tag page. They are tagged commits,
period. A tag is a pointer to a commit, and has no further meaning.
If your distribution has blocked -U self updater and you want a newer version:
@ -185,7 +185,7 @@ unfortunately sometimes removed.
INXI CONFIGURATION: https://smxi.org/docs/inxi-configuration.htm
HTML MAN PAGE: https://smxi.org/docs/inxi-man.htm
INXI OPTIONS PAGE: http://smxi.org/docs/inxi-options.htm
INXI OPTIONS PAGE: https://smxi.org/docs/inxi-options.htm
NOTE: Check the inxi version number on each doc page to see which version will
support the options listed. The man and options page also link to a legacy

8
inxi
View file

@ -121,7 +121,7 @@ my $line1 = "-------------------------------------------------------------------
my $line2 = "======================================================================\n";
my $line3 = "----------------------------------------\n";
my ($output_file,$output_type) = ('','screen');
my $prefix = 0; # for the primiary row hash key prefix
my $prefix = 0; # for the primary row hash key prefix
## Initialize internal hashes
# these assign a separator to non irc states. Important! Using ':' can
@ -14093,7 +14093,7 @@ sub get {
push(@rows,device_output());
}
push(@rows,usb_output());
# note: rasberry pi uses usb networking only
# note: raspberry pi uses usb networking only
if (!@rows){
if ($b_arm || $b_mips){
my $type = ($b_arm) ? 'arm' : 'mips';
@ -23317,7 +23317,7 @@ sub get_linux_distro {
$distro_id = $1;
$b_skip_issue = 1;
}
# this raspbian detection fails for rasberry pi os
# this raspbian detection fails for raspberry pi os
elsif ($lc_issue =~ /(raspbian|peppermint)/){
$distro_id = $1;
$distro_file = $os_release if @osr;
@ -24673,7 +24673,7 @@ sub bsd_data {
eval $end if $b_log;
return $memory;
}
# rasberry pi only
# raspberry pi only
sub gpu_ram_arm {
eval $start if $b_log;
my ($gpu_ram) = (0);

42
inxi.1
View file

@ -32,7 +32,7 @@ inxi \- Command line system information script for console and IRC
[\fB\-\-weather\-unit\fR {\fBm\fR|\fBi\fR|\fBmi\fR|\fBim\fR}] [\fB\-y WIDTH\fR]
\fBinxi\fR [\fB\-\-memory\-modules\fR] [\fB\-\-memory\-short\fR]
[\fB\-\-recommends\fR] [\fB\-\-sensors\-default\fR] [\fB\-\-slots\fR]
[\fB\-\-recommends\fR] [\fB\-\-sensors\-default\fR] [\fB\-\-slots\fR]
\fBinxi\fB [\fB\-x\fR|\fB\-xx\fR|\fB\-xxx\fR|\fB\-a\fR] \fB\-OPTION(s)\fR
@ -131,7 +131,7 @@ Set color scheme. If no scheme number is supplied, 0 is assumed.
.TP
.B \-c \fR[\fB94\fR\-\fB99\fR]
These color selectors run a color selector option prior to inxi starting
These color selectors run a color selector option prior to inxi starting
which lets you set the config file value for the selection.
NOTE: All configuration file set color values are removed when output is
@ -160,7 +160,7 @@ Konversation etc.
.TP
.B \-c 98\fR
\- Console IRC not in X.
\- Console IRC not in X.
.TP
.B \-c 99\fR
@ -328,7 +328,7 @@ for extra information (init type/version, runlevel, packages).
Note: if \fB\-m\fR is used or triggered, the memory item will show in the main
Memory: report of \fB\-m\fR, not in \fB\Info:\fR.
Rasberry Pi only: uses \fBvcgencmd get_mem gpu\fR to get gpu RAM amount,
Raspberry Pi only: uses \fBvcgencmd get_mem gpu\fR to get gpu RAM amount,
if user is in video group and \fBvcgencmd\fR is installed. Uses
this result to increase the \fBMemory:\fR amount and \fBused:\fR amounts.
@ -445,10 +445,10 @@ Other types of logical block handling like LUKS, bcache show as:
.TP
.B \-m\fR,\fB \-\-memory\fR
Memory (RAM) data. Does not display with \fB\-b\fR or \fB\-F\fR unless you
Memory (RAM) data. Does not display with \fB\-b\fR or \fB\-F\fR unless you
use \fB\-m\fR explicitly. Ordered by system board physical system memory
array(s) (\fBArray\-[number]\fR), and individual memory devices
(\fBDevice\-[number]\fR). Physical memory array data shows array capacity,
(\fBDevice\-[number]\fR). Physical memory array data shows array capacity,
number of devices supported, and Error Correction information. Devices shows
locator data (highly variable in syntax), size, speed, type
(eg: \fBtype: DDR3\fR).
@ -723,7 +723,7 @@ man install.
.B \-\-usb\fR \- See \fB\-J\fR
.TP
.B \-V\fR, \fB\-\-version\fR
.B \-V\fR, \fB\-\-version\fR
inxi version information. Prints information then exits.
.TP
@ -1069,7 +1069,7 @@ specific vendor [product] information.
.TP
.B \-x \-o\fR, \fB\-x \-p\fR, \fB\-x \-P\fR
\- Adds \fBmapper:\fR (the \fB/dev/mapper/\fR partitioni ID)
\- Adds \fBmapper:\fR (the \fB/dev/mapper/\fR partition ID)
if mapped partition.
Example: \fBID\-4: /home ... dev: /dev/dm-6 mapped: ar0-home\fR
@ -1137,7 +1137,7 @@ its design speed.
NVMe drives: adds lanes, and (per direction) speed is calculated with
lane speed * lanes * PCIe overhead. PCIe 1 and 2 have data rates of
GT/s * .8 = Gb/s (10 bits required to transfer 8 bits of data).
GT/s * .8 = Gb/s (10 bits required to transfer 8 bits of data).
PCIe 3 and greater transfer data at a rate of GT/s * 128/130 * lanes = Gb/s
(130 bits required to transfer 128 bits of data).
@ -1161,7 +1161,7 @@ if applicable) for each device.
\- Adds Xorg compositor, if found (always shows for Wayland systems).
\- For free drivers, adds OpenGL compatibility version number if available.
\- For free drivers, adds OpenGL compatibility version number if available.
For nonfree drivers, the core version and compatibility versions are usually
the same. Example:
@ -1194,7 +1194,7 @@ where only 1 type had results, does not show total after \fBPackages:\fR. Does
not show installed package managers wtih 0 packages. See \fB\-a\fR for full
output. Moves to \fBRepos\fR if \fB\-rxx\fR.
\- Adds parent program (or tty) that started shell, if not IRC client.
\- Adds parent program (or pty/tty) that started shell, if not IRC client.
.TP
.B \-xx \-j\fR (\fB\-\-swap\fR), \fB\-xx \-p\fR, \fB\-xx \-P\fR
@ -1218,7 +1218,7 @@ documentation to better understand their use of the term 'stripes'.
.B \-xx \-m\fR, \fB\-\-memory\-modules\fR
\- Adds memory device Manufacturer.
\- Adds memory device Part Number (\fBpart\-no:\fR). Useful for ordering new
\- Adds memory device Part Number (\fBpart\-no:\fR). Useful for ordering new
or replacement memory sticks etc. Part numbers are unique, particularly if you
use the word \fBmemory\fR in the search as well. With \fB\-xxx\fR, also shows
serial number.
@ -1309,7 +1309,7 @@ Currently not able to detect all schemes, but handles the most common, e.g.
cases), e.g. \fBtype: HDD rpm: 7200\fR, or \fBtype: SSD\fR if positive SSD
identification was made. If no HDD, rotation, or positive SSD ID found, shows
\fBtype: N/A\fR. Not all HDD spinning disks report their speed, so even if they
are spinnning, no rpm data will show.
are spinning, no rpm data will show.
.TP
.B \-xxx \-E\fR (\fB\-\-bluetooth\fR)
@ -1911,11 +1911,11 @@ Example: \fBinxi \-sxx \-\-sensors\-exclude k10temp-pci-00c3\fR
.TP
.B \-\-sensors\-use\fR
Use only the (comma separated) sensor arrays for \fB\-s\fR output. Make
Use only the (comma separated) sensor arrays for \fB\-s\fR output. Make
permanent with \fBSENSORS_USE\fR configuration item. Sensor array ID value
must be the exact value shown in lm\-sensors sensors output (Linux/lm-sensors
only). If you only want to exclude one (or more) sensors from the output,
use \fB\-\-sensors\-exlude\fR.
use \fB\-\-sensors\-exclude\fR.
Can be useful if the default sensor data used by inxi is not from the right
sensor array. Note that all other sensor data will be removed, which may lead
@ -1927,7 +1927,7 @@ another one.
Most likely best use is when one (or two) of the sensor arrays has all the
sensor data you want, and you just want to make sure inxi doesn't use data
from another array that has inacurate or misleading data.
from another array that has inaccurate or misleading data.
Note that gpu, network, disk, and other specific device monitor chips are
excluded by default, and should not be added since they do not provide cpu,
@ -1950,10 +1950,10 @@ Overrides default internal value and user configuration value:
.TP
.B \-\-tty\fR
Forces internal IRC flag to off. Used in unhandled cases where the program
running inxi may not be seen as a shell/tty, but it is not an IRC client.
running inxi may not be seen as a shell/pty/tty, but it is not an IRC client.
Put \fB\-\-tty\fR first in option list to avoid unexpected errors. If you want
a specific output width, use the \fB\-\-width\fR option. If you want normal
color codes in the output, use the \fB\-c [color ID]\fR flag.
color codes in the output, use the \fB\-c [color ID]\fR flag.
The sign you need to use this is extra numbers before the key/value pairs of
the output of your program. These are IRC, not TTY, color codes. Please post a
@ -2213,7 +2213,7 @@ HTML downloaders are hanging.
or \fBc\fR. Default is 5.
\fBSENSORS_CPU_NO\fR In cases of ambiguous temp1/temp2 (inxi can't figure out
which is the CPU), forces sensors to use either value 1 or 2 as CPU
which is the CPU), forces sensors to use either value 1 or 2 as CPU
temperature. See the above configuration page on smxi.org for full info.
\fBSENSORS_EXCLUDE\fR Exclude supplied sensor array[s] from sensor output.
@ -2306,7 +2306,7 @@ You can also visit
is a fork of \fBlocsmif\fR's very clever \fBinfobash\fR script.
Original infobash author and copyright holder:
Copyright (C) 2005\-2007 Michiel de Boer aka locsmif
Copyright (C) 2005\-2007 Michiel de Boer aka locsmif
inxi version: Copyright (C) 2008\-2021 Harald Hope
@ -2330,7 +2330,7 @@ Jarett.Stevens \- \fBdmidecode \-M\fR patch for older systems with no
.SH SPECIAL THANKS TO THE FOLLOWING
The nice people at irc.oftc.net channels #linux\-smokers\-club and #smxi,
who all really have to be considered to be co\-developers because of their
who all really have to be considered to be co\-developers because of their
non\-stop enthusiasm and willingness to provide real\-time testing and
debugging of inxi development.