mirror of
https://github.com/smxi/inxi.git
synced 2024-11-16 16:21:39 +00:00
New version, new man. Very new man.
Man features new section, configuration options, which lists the main config options users would be likely to use. This should help users who will never check the actual documentation web page realize that there are many internal configuration options available. Many edits in man, more to come I suspect. Bug fixes in inxi: 1. removed a few stray debuggers that were creating debugging output 2. fixed a usb driver bug that would create warning messages from Perl (thanks Manjaro for finding that one) New Option: 1. Added: --indent-min - goes with the user configuration option: INDENT_MIN and allows users to experiment with different indent settings. This is what trips the auto line wrap of line starters. This may be revisited, and this switch will make it easier for users to see for themselves which they prefer, what trip point, etc. This will help determine pre 3.0.0 what the default auto wrap trip point, if any, will be. Added more data to debugger tool, more lsblk, which is going to need a lot more data to solve a new issue with dm/encrypt/lvm, initial $MANPAGE data, to see if anyone actually ever uses that environmental variable. Special thanks to Manjaro for being as far as I know the first to package Perl inxi.
This commit is contained in:
Harald Hope
parent
51da186c9d
commit
4af90c3406
31
inxi
31
inxi
|
|
@ -36,9 +36,9 @@ use POSIX qw(uname strftime ttyname);
|
|||
|
||||
## INXI INFO ##
|
||||
my $self_name='inxi';
|
||||
my $self_version='2.9.05';
|
||||
my $self_version='2.9.06';
|
||||
my $self_date='2018-03-24';
|
||||
my $self_patch='00';
|
||||
my $self_patch='0';
|
||||
## END INXI INFO ##
|
||||
|
||||
### INITIALIZE VARIABLES ###
|
||||
|
|
@ -1368,6 +1368,7 @@ sub disk_data {
|
|||
['df', '-P'],
|
||||
['lsblk', '-fs'],
|
||||
['lsblk', '-fsr'],
|
||||
['lsblk', '-fsP'],
|
||||
['lsblk', '-a'],
|
||||
['lsblk', '-ar'],
|
||||
['lsblk', '-p'],
|
||||
|
|
@ -1375,10 +1376,10 @@ sub disk_data {
|
|||
['lsblk', '-pP'],
|
||||
['lsblk', '-r'],
|
||||
['lsblk', '-r --output TYPE,NAME,PKNAME,RM,FSTYPE,SIZE'],
|
||||
['lsblk', '-br --output TYPE,NAME,PKNAME,RM,FSTYPE,SIZE'],
|
||||
['lsblk', '-rb --output TYPE,NAME,PKNAME,RM,FSTYPE,SIZE'],
|
||||
['lsblk', '-Pb --output TYPE,NAME,PKNAME,RM,FSTYPE,SIZE'],
|
||||
['lsblk', '-r --output NAME,PKNAME,TYPE,RM,FSTYPE,SIZE'],
|
||||
['lsblk', '-P --output NAME,PKNAME,TYPE,RM,FSTYPE,SIZE'],
|
||||
['lsblk', '-rb --output NAME,PKNAME,TYPE,RM,FSTYPE,SIZE'],
|
||||
['lsblk', '-Pb --output NAME,PKNAME,TYPE,RM,FSTYPE,SIZE'],
|
||||
['gpart', 'list'],
|
||||
['gpart', 'show'],
|
||||
['gpart', 'status'],
|
||||
|
|
@ -1543,6 +1544,7 @@ sub system_data {
|
|||
'cc' => $ENV{'CC'},
|
||||
# @(#)MIRBSD KSH R56 2018/03/09: ksh and mksh
|
||||
'ksh-version' => $ENV{'KSH_VERSION'},
|
||||
'manpath' => $ENV{'MANPATH'},
|
||||
'xdg-config-home' => $ENV{'XDG_CONFIG_HOME'},
|
||||
'xdg-config-dirs' => $ENV{'XDG_CONFIG_DIRS'},
|
||||
'xdg-data-home' => $ENV{'XDG_DATA_HOME'},
|
||||
|
|
@ -3694,6 +3696,14 @@ sub get_options{
|
|||
$help_type = 'full'; },
|
||||
'hostname' => sub {
|
||||
$show{'host'} = 1 },
|
||||
'indent-min:i' => sub {
|
||||
my ($opt,$arg) = @_;
|
||||
if ($arg =~ /^\d+$/){
|
||||
$size{'indent-min'} = 1;
|
||||
}
|
||||
else {
|
||||
error_handler('bad-arg', $opt, $arg);
|
||||
}},
|
||||
'irc' => sub {
|
||||
$b_irc = 1; },
|
||||
'man' => sub {
|
||||
|
|
@ -4118,6 +4128,8 @@ sub show_options {
|
|||
['1', '', '--dmidecode', "Forces use of dmidecode data instead of /sys where
|
||||
relevant (-M)." ],
|
||||
['1', '', '--hostname', "Turns on hostname in output." ],
|
||||
['1', '', '--indent-min', "Takes value 80 or greater. Increases or decreases the point
|
||||
where $self_name autowraps line starters." ],
|
||||
['1', '', '--limit', "[-1 - x] -1 removes limit. Raise or lower max output limit of IP addresses for -i." ],
|
||||
['1', '', '--man', "Installs correct man versino for dev branch (-U 3) or pinxi using -U." ],
|
||||
['1', '', '--no-hostname', "Turns off hostname in output. Useful if showing output from
|
||||
|
|
@ -11435,7 +11447,6 @@ sub get_repos_linux {
|
|||
if ($url && $title && defined $enabled){
|
||||
if ($enabled > 0){
|
||||
push @content, "$title ~ $url";
|
||||
print "here $title\n";
|
||||
}
|
||||
($enabled,$url,$title) = (undef,'','');
|
||||
}
|
||||
|
|
@ -11918,7 +11929,6 @@ sub sensors_data {
|
|||
$sensors{'cpu-temp'} = $1;
|
||||
$working_unit = $2;
|
||||
$sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
|
||||
print "here\n";
|
||||
}
|
||||
if (/^PECI\sAgent\s0.*:([0-9\.]+)[\s°]*(C|F)/i) {
|
||||
$sensors{'cpu-peci-temp'} = $1;
|
||||
|
|
@ -12658,7 +12668,7 @@ sub unmounted_filesystem {
|
|||
# order matters in this test!
|
||||
my @filesystems = ('ext2','ext3','ext4','ext5','ext','ntfs',
|
||||
'fat32','fat16','FAT\s\(.*\)','vfat','fatx','tfat','swap','btrfs',
|
||||
'ffs','hfs\+','hfs\splus','hfs\sextended\sversion\s[1-9]','hfsj',
|
||||
'ffs','hammer','hfs\+','hfs\splus','hfs\sextended\sversion\s[1-9]','hfsj',
|
||||
'hfs','jfs','nss','reiserfs','reiser4','ufs2','ufs','xfs','zfs');
|
||||
if ($file){
|
||||
# only use sudo if not root, -n option requires sudo -V 1.7 or greater.
|
||||
|
|
@ -14605,7 +14615,7 @@ sub get_usb_drivers {
|
|||
#print join "\n", @drivers, "\n";
|
||||
$driver = join ',', @drivers if @drivers;
|
||||
}
|
||||
@temp = ("$driver","$path");
|
||||
@temp = ($driver,$path);
|
||||
eval $end if $b_log;
|
||||
return @temp;
|
||||
}
|
||||
|
|
@ -14666,8 +14676,9 @@ sub set_dmesg_boot_data {
|
|||
push @temp, $_;
|
||||
}
|
||||
@dmesg_boot = @temp;
|
||||
# FreeBSD: 'da*' is a USB device 'ada*' is a SATA device 'mmcsd*' is an SD card
|
||||
if ($b_dm_boot_disk && @dmesg_boot){
|
||||
@dm_boot_disk = grep {/^(ad|ada|mmcblk|nvme[0-9]+n|sd|wd)[0-9]+(:|\sat\s)/} @dmesg_boot;
|
||||
@dm_boot_disk = grep {/^(ad|ada|da|mmcblk|mmcsd|nvme[0-9]+n|sd|wd)[0-9]+(:|\sat\s)/} @dmesg_boot;
|
||||
log_data('dump','@dm_boot_disk',\@dm_boot_disk) if $b_log;
|
||||
print Dumper \@dm_boot_disk if $test[9];
|
||||
}
|
||||
|
|
|
|||
95
inxi.1
95
inxi.1
|
|
@ -1,4 +1,4 @@
|
|||
.TH INXI 1 "2018\-03\-23" inxi "inxi manual"
|
||||
.TH INXI 1 "2018\-03\-24" inxi "inxi manual"
|
||||
.SH NAME
|
||||
inxi \- Command line system information script for console and IRC
|
||||
.SH SYNOPSIS
|
||||
|
|
@ -754,7 +754,16 @@ Force inxi to use [curl|fetch|perl|wget] for downloads.
|
|||
.TP
|
||||
.B \-\-hostname\fR
|
||||
Turns on hostname in System line. Overrides inxi config file value (if set):
|
||||
SHOW_HOST='false'.
|
||||
|
||||
\fBSHOW_HOST='false'\fR
|
||||
|
||||
.TP
|
||||
.B \-\-indent\-min [integer]\fR
|
||||
Overrides default indent minimum value. This is the value that makes inxi change from
|
||||
wrapped line starters [like \fBInfo\fR] to non wrapped. If less than 80, no wrapping will
|
||||
occur. Overrides internal default value and user configuration value:
|
||||
|
||||
\fBINDENT_MIN=85\fR
|
||||
|
||||
.TP
|
||||
.B \-\-limit [\-1 \- x]\fR
|
||||
|
|
@ -767,7 +776,9 @@ Updates / installs man page with -U if pinxi or using \-U 3 dev branch.
|
|||
.TP
|
||||
.B \-\-no\-hostname\fR
|
||||
Turns off hostname in System line. Useful, with \fB\-z\fR, for anonymizing your
|
||||
inxi output for posting on forums or IRC.
|
||||
inxi output for posting on forums or IRC. Same as configuration value:
|
||||
|
||||
\fBSHOW_HOST='false'\fR
|
||||
|
||||
.TP
|
||||
.B \-\-no\-ssl\fR
|
||||
|
|
@ -793,6 +804,10 @@ to let system catch up and show a more accurate CPU use. Example:
|
|||
|
||||
\fBinxi \-Cxxx \-\-sleep 0.15\fR
|
||||
|
||||
Overrides default internal value and user configuraton value:
|
||||
|
||||
\fBCPU_SLEEP=0.25\fR
|
||||
|
||||
.SH DEBUGGING OPTIONS
|
||||
.TP
|
||||
.B \-\-dbg [1\-x]\fR
|
||||
|
|
@ -813,7 +828,8 @@ Debugger output generator.
|
|||
|
||||
.TP
|
||||
.B \-\-debug 10\fR
|
||||
\- Basic logging. Check \fB/home/yourname/.inxi/inxi*.log
|
||||
\- Basic logging. Check \fB$XDG_DATA_HOME/inxi/inxi.log\fB or
|
||||
\fB$HOME/.local/share/inxi/inxi.log or \fB$HOME/.inxi/inxi.log
|
||||
|
||||
.TP
|
||||
.B \-\-debug 11\fR
|
||||
|
|
@ -857,6 +873,7 @@ For alternate ftp upload locations: Example:
|
|||
BitchX, Gaim/Pidgin, ircII, Irssi, Konversation, Kopete, KSirc, KVIrc, Weechat,
|
||||
and Xchat. Plus any others that are capable of displaying either built in or external
|
||||
script output.
|
||||
|
||||
.SH RUNNING IN IRC CLIENT
|
||||
To trigger inxi output in your IRC client, pick the appropriate method from the
|
||||
list below:
|
||||
|
|
@ -932,7 +949,8 @@ shell. Then to run inxi, you would enter a command like this:
|
|||
|
||||
If you leave off the \fB\-o\fR, only you will see the output on your local
|
||||
weechat. WeeChat users may also like to check out the weeget.py
|
||||
.SH INITIALIZATION FILE
|
||||
|
||||
.SH CONFIGURATION FILE
|
||||
inxi will read the following configuration/initialization files in the
|
||||
following order:
|
||||
|
||||
|
|
@ -946,9 +964,63 @@ the legacy location is used:
|
|||
\fB$XDG_CONFIG_HOME/inxi.conf\fR or \fB$HOME/.conf/inxi.conf\fR or
|
||||
\fB$HOME/.inxi/inxi.conf\fR
|
||||
|
||||
See wiki pages for more information on how to set these up:
|
||||
.TP
|
||||
.SH CONFIGURATION OPTIONS
|
||||
|
||||
See the documentation page for more complete information on how to set
|
||||
these up, and for complete list of options:
|
||||
|
||||
.I https://smxi.org/docs/inxi\-configuration.htm
|
||||
|
||||
Here's a brief overview of the basic options you are likely to want to use:
|
||||
|
||||
\fBCOLS_MAX_CONSOLE\fR The max display column width on terminal.
|
||||
|
||||
\fBCOLS_MAX_IRC\fR The max display column width on IRC clients.
|
||||
|
||||
\fBCOLS_MAX_NO_DISPLAY\fR The max display column width in console, out of GUI desktop.
|
||||
|
||||
\fBCPU_SLEEP\fR Decimal value 0 or more. Default is usually around 0.35 seconds.
|
||||
Time that inxi will 'sleep' before getting CPU speed data, so that it reflects
|
||||
actual system state.
|
||||
|
||||
\fBDOWNLOADER\fR Sets default inxi downloader: curl, fetch, ftp, perl, wget.
|
||||
See \-\-recommends outut for more information on downloaders and Perl downloaders.
|
||||
|
||||
\fBFILTER_STRING\fR Default \fB<filter>\fR. Any string you prefer to see instead
|
||||
for filtered values.
|
||||
|
||||
\fBINDENT_MIN\fR The point where the line starter wrapping to its own line happens.
|
||||
Overrides default. See \fB\-\-indent\-min\fR. If 80 or less, wrap will never happen.
|
||||
|
||||
\fBLIMIT\fR Overrides default of 10 IP addresses per IF. This is only of interest
|
||||
to sys admins running servers with a lot of IP addresses.
|
||||
|
||||
\fBPS_COUNT\fR The default number of items showing per -t type, m or c. Default
|
||||
is 5.
|
||||
|
||||
\fBSENSORS_CPU_NO\fR Forces sensors to use in cases of ambiguous temp1/temp2
|
||||
values 1 or 2. See the above configuration page on smxi.org for full info.
|
||||
|
||||
\fBSEP2_CONSOLE\fR Replaces default key / value separator of ':'.
|
||||
|
||||
It's best to use the \fB-c [94-99]\fR color selector tool to set the following values
|
||||
because it will correctly update the configuration file and remove any invalid
|
||||
or conflcting items, but if you prefer to create your own configuration files,
|
||||
here are the options. All take the integer value from the options available in
|
||||
\fB\-c 94-99\fR.
|
||||
|
||||
\fBCONSOLE_COLOR_SCHEME\fR The color scheme for console output (not in X/Wayland).
|
||||
|
||||
\fBGLOBAL_COLOR_SCHEME\fR If only color scheme overrides all others.
|
||||
|
||||
\fBIRC_COLOR_SCHEME\fR Desktop X/Wayland IRC CLI color scheme.
|
||||
|
||||
\fBIRC_CONS_COLOR_SCHEME\fR Out of X/Wayland, IRC CLI color scheme.
|
||||
|
||||
\fBIRC_X_TERM_COLOR_SCHEME\fR In X/Wayland IRC client terminal color scheme.
|
||||
|
||||
\fBVIRT_TERM_COLOR_SCHEME\fR Color scheme for virtual terminal output (in X/Wayland).
|
||||
|
||||
.SH BUGS
|
||||
Please report bugs using the following resources.
|
||||
|
||||
|
|
@ -960,7 +1032,7 @@ inxi main website/source/wiki, file an issue report:
|
|||
.I https://github.com/smxi/inxi/issues
|
||||
.TP
|
||||
post on inxi developer forums:
|
||||
.I http://techpatterns.com/forums/forum\-32.html
|
||||
.I https://techpatterns.com/forums/forum\-32.html
|
||||
.TP
|
||||
You can also visit
|
||||
.I irc.oftc.net
|
||||
|
|
@ -972,7 +1044,7 @@ You can also visit
|
|||
.SH AUTHOR AND CONTRIBUTORS TO CODE
|
||||
|
||||
.B inxi
|
||||
is is a fork of locsmif's very clever infobash script.
|
||||
is is a fork of locsmif's very clever \fBinfobash\fR script.
|
||||
|
||||
Original infobash author and copyright holder:
|
||||
Copyright (C) 2005\-2007 Michiel de Boer a.k.a. locsmif
|
||||
|
|
@ -1011,6 +1083,11 @@ particularly for the 3.0.0 release.
|
|||
ArcherSeven (Max) and Iotaka, who always manage to find the weirdest or most extreme
|
||||
hardware and setups that help make inxi much more robust.
|
||||
|
||||
For the vastly underrated skill of copy/proof reading and error/glich catching in
|
||||
text and output, hydrurga (Pete). Even if people don't recognize the value of
|
||||
the skills required to patiently pore through output and text to find errors
|
||||
and inconsistencies, I do.
|
||||
|
||||
All the inxi package maintainers, distro support people, forum moderators,
|
||||
and in particular, sys admins with their particular issues, which almost always
|
||||
help make inxi better, and any others who contribute ideas, suggestions, and patches.
|
||||
|
|
|
|||
|
|
@ -1,3 +1,44 @@
|
|||
=====================================================================================
|
||||
Version: 2.9.06
|
||||
Patch Version: 0
|
||||
Script Date: 2018-03-24
|
||||
-----------------------------------
|
||||
Changes:
|
||||
-----------------------------------
|
||||
|
||||
New version, new man. Very new man.
|
||||
|
||||
Man features new section, configuration options, which lists the main config options
|
||||
users would be likely to use.
|
||||
|
||||
This should help users who will never check the actual documentation web page
|
||||
realize that there are many internal configuration options available.
|
||||
|
||||
Many edits in man, more to come I suspect.
|
||||
|
||||
Bug fixes in inxi:
|
||||
1. removed a few stray debuggers that were creating debugging output
|
||||
2. fixed a usb driver bug that would create warning messages from Perl (thanks Manjaro
|
||||
for finding that one)
|
||||
|
||||
New Option:
|
||||
1. Added: --indent-min - goes with the user configuration option: INDENT_MIN
|
||||
and allows users to experiment with different indent settings. This is what trips the
|
||||
auto line wrap of line starters. This may be revisited, and this switch will make it
|
||||
easier for users to see for themselves which they prefer, what trip point, etc.
|
||||
|
||||
This will help determine pre 3.0.0 what the default auto wrap trip point, if any,
|
||||
will be.
|
||||
|
||||
Added more data to debugger tool, more lsblk, which is going to need a lot more data
|
||||
to solve a new issue with dm/encrypt/lvm, initial $MANPAGE data, to see if anyone
|
||||
actually ever uses that environmental variable.
|
||||
|
||||
Special thanks to Manjaro for being as far as I know the first to package Perl inxi.
|
||||
|
||||
-----------------------------------
|
||||
-- Harald Hope - Sat, 24 Mar 2018 18:06:33 -0700
|
||||
|
||||
=====================================================================================
|
||||
Version: 2.9.05
|
||||
Patch Version: 00
|
||||
|
|
|
|||
Loading…
Reference in a new issue