aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@ubuntu.com>2018-08-03 16:43:43 -0400
committerLibravatarUnit 193 <unit193@ubuntu.com>2018-08-03 16:43:43 -0400
commit17fee215fcdf439e9eb6ee2f06e37077a8b5469e (patch)
tree7dffa567328507f632efd19fb09222cb82cfdc3c
parentc34f676b63ac484546c276b09bfaebbeb88f337e (diff)
parentc4758155b5c39094c0b39d106b4a7f57db6a359a (diff)
downloadinxi-17fee215fcdf439e9eb6ee2f06e37077a8b5469e.tar.bz2
inxi-17fee215fcdf439e9eb6ee2f06e37077a8b5469e.tar.xz
inxi-17fee215fcdf439e9eb6ee2f06e37077a8b5469e.tar.zst
Update upstream source from tag 'upstream/3.0.20-1'
Update to upstream version '3.0.20-1' with Debian dir 38b2a440c8e73a02cf37ac7f74f1465ae3fe5e14
-rw-r--r--README.txt2
-rwxr-xr-xinxi743
-rw-r--r--inxi.112
-rw-r--r--inxi.changelog138
4 files changed, 537 insertions, 358 deletions
diff --git a/README.txt b/README.txt
index 35ce2e2..dd9fab0 100644
--- a/README.txt
+++ b/README.txt
@@ -259,7 +259,7 @@ you get into it.
OSX:
Do not insult real BSDs by calling OSX a BSD. OSX is the least Unix-like
operating system I've ever seen that claims to be a Unix, its tools are
-mutated, it's data randomly and non-standardly organized, and it totally fails
+mutated, its data randomly and non-standardly organized, and it totally fails
to respect the 'spirit' of Unix, even though it might pass some random tests
that certify a system as a 'Unix'.
diff --git a/inxi b/inxi
index a444e66..f06943c 100755
--- a/inxi
+++ b/inxi
@@ -31,8 +31,8 @@ use POSIX qw(uname strftime ttyname);
## INXI INFO ##
my $self_name='inxi';
-my $self_version='3.0.18';
-my $self_date='2018-07-16';
+my $self_version='3.0.20';
+my $self_date='2018-07-30';
my $self_patch='00';
## END INXI INFO ##
@@ -139,7 +139,7 @@ sub main {
eval $start if $b_log;
initialize();
## use for start client debugging
- # $debug = 3; # 3 prints timers
+ # $debug = 10; # 3 prints timers
# set_debugger(); # for debugging of konvi issues
#my $ob_start = StartClient->new();
#$ob_start->get_client_data();
@@ -443,7 +443,9 @@ sub set_os {
sub set_path {
# Extra path variable to make execute failures less likely, merged below
my (@path);
- @paths = qw(/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin /usr/X11R6/bin);
+ # NOTE: recent Xorg's show error if you try /usr/bin/Xorg -version but work
+ # if you use the /usr/lib/xorg-server/Xorg path.
+ @paths = qw(/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin);
@path = split /:/, $ENV{'PATH'} if $ENV{'PATH'};
# print "paths: @paths\nPATH: $ENV{'PATH'}\n";
# Create a difference of $PATH and $extra_paths and add that to $PATH:
@@ -835,7 +837,7 @@ sub create_color_selections {
if ($i > 9){
$spacer = '^';
}
- if ($configs{'selection'} =~ /^global|irc-gui|irc-console|irc-virt-term$/ && $i > $safe_color_count ){
+ if ($configs{'selection'} =~ /^(global|irc-gui|irc-console|irc-virt-term)$/ && $i > $safe_color_count ){
last;
}
main::set_color_scheme($i);
@@ -875,7 +877,7 @@ sub get_selection {
@data = ();
my $response = <STDIN>;
chomp $response;
- if ($response =~ /([^0-9]|^$)/ || ( $response =~ /^[0-9]+$/ && $response > ($count + 3) )){
+ if (!main::is_int($response) || $response > ($count + 3) ){
@data = (
[0, '', '', "Error - Invalid Selection. You entered this: $response. Hit <ENTER> to continue."],
[0, '', '', "$line1"],
@@ -930,12 +932,15 @@ sub process_selection {
);
main::print_basic(@data);
if ($configs{'selection'} eq 'global'){
- delete_all_config_colors();
+ delete_all_colors();
+ }
+ else {
+ delete_global_color();
}
set_config_color_scheme($response);
}
}
-sub delete_all_config_colors {
+sub delete_all_colors {
my @file_lines = main::reader( $user_config_file );
open( $w_fh, '>', $user_config_file ) or error_handler('open', $user_config_file, $!);
foreach ( @file_lines ) {
@@ -945,6 +950,16 @@ sub delete_all_config_colors {
}
close $w_fh;
}
+sub delete_global_color {
+ my @file_lines = main::reader( $user_config_file );
+ open( $w_fh, '>', $user_config_file ) or error_handler('open', $user_config_file, $!);
+ foreach ( @file_lines ) {
+ if ( $_ !~ /^GLOBAL_COLOR_SCHEME/){
+ print {$w_fh} "$_";
+ }
+ }
+ close $w_fh;
+}
sub set_config_color_scheme {
my $value = shift;
my @file_lines = main::reader( $user_config_file );
@@ -1015,10 +1030,11 @@ sub get_configs {
s/^\s+//;
s/\s+$//;
s/'|"//g;
- s/true/1/; # switch to 1/0 perl boolean
- s/false/0/; # switch to 1/0 perl boolean
+ s/true/1/i; # switch to 1/0 perl boolean
+ s/false/0/i; # switch to 1/0 perl boolean
next unless length;
($key, $val) = split(/\s*=\s*/, $_, 2);
+ next unless length($val);
get_config_item($key,$val);
# print "f: $file key: $key val: $val\n";
}
@@ -1026,13 +1042,15 @@ sub get_configs {
}
}
+# note: someone managed to make a config file with corrupted values, so check int
+# explicitly, don't assume it was done correctly.
# args: 0: key; 1: value
sub get_config_item {
my ($key,$val) = @_;
- if ($key eq 'ALLOW_UPDATE' || $key eq 'B_ALLOW_UPDATE') {$b_update = int($val)}
- elsif ($key eq 'ALLOW_WEATHER' || $key eq 'B_ALLOW_WEATHER') {$b_weather = int($val)}
- elsif ($key eq 'CPU_SLEEP') {$cpu_sleep = $val if $val =~ /^[0-9\.]$/}
- elsif ($key eq 'DL_TIMEOUT') {$dl_timeout = int($val)}
+ if ($key eq 'ALLOW_UPDATE' || $key eq 'B_ALLOW_UPDATE') {$b_update = $val if is_int($val)}
+ elsif ($key eq 'ALLOW_WEATHER' || $key eq 'B_ALLOW_WEATHER') {$b_weather = $val if is_int($val)}
+ elsif ($key eq 'CPU_SLEEP') {$cpu_sleep = $val if is_numeric($val)}
+ elsif ($key eq 'DL_TIMEOUT') {$dl_timeout = $val if is_int($val)}
elsif ($key eq 'DOWNLOADER') {
if ($val =~ /^(curl|fetch|ftp|perl|wget)$/){
# this dumps all the other data and resets %dl for only the
@@ -1042,11 +1060,11 @@ sub get_config_item {
}}
elsif ($key eq 'FILTER_STRING') {$filter_string = $val}
elsif ($key eq 'LANGUAGE') {$language = $val if $val =~ /^(en)$/}
- elsif ($key eq 'LIMIT') {$limit = int($val)}
- elsif ($key eq 'OUTPUT_TYPE') {$output_type = $val if $val =~ /^json|screen|xml/}
- elsif ($key eq 'PS_COUNT') {$ps_count = int($val) }
- elsif ($key eq 'SENSORS_CPU_NO') {$sensors_cpu_nu = int($val)}
- elsif ($key eq 'SHOW_HOST' || $key eq 'B_SHOW_HOST') { $show{'host'} = int($val)}
+ elsif ($key eq 'LIMIT') {$limit = $val if is_int($val)}
+ elsif ($key eq 'OUTPUT_TYPE') {$output_type = $val if $val =~ /^(json|screen|xml)$/}
+ elsif ($key eq 'PS_COUNT') {$ps_count = $val if is_int($val) }
+ elsif ($key eq 'SENSORS_CPU_NO') {$sensors_cpu_nu = $val if is_int($val)}
+ elsif ($key eq 'SHOW_HOST' || $key eq 'B_SHOW_HOST') { $show{'host'} = $val if is_int($val)}
elsif ($key eq 'WEATHER_UNIT') {
$val = lc($val) if $val;
if ($val && $val =~ /^(c|f|cf|fc|i|m|im|mi)$/){
@@ -1056,23 +1074,23 @@ sub get_config_item {
}
}
# layout
- elsif ($key eq 'CONSOLE_COLOR_SCHEME') {$colors{'console'} = int($val)}
- elsif ($key eq 'GLOBAL_COLOR_SCHEME') {$colors{'global'} = int($val)}
- elsif ($key eq 'IRC_COLOR_SCHEME') {$colors{'irc-gui'} = int($val)}
- elsif ($key eq 'IRC_CONS_COLOR_SCHEME') {$colors{'irc-console'} = int($val)}
- elsif ($key eq 'IRC_X_TERM_COLOR_SCHEME') {$colors{'irc-virt-term'} = int($val)}
- elsif ($key eq 'VIRT_TERM_COLOR_SCHEME') {$colors{'virt-term'} = int($val)}
+ elsif ($key eq 'CONSOLE_COLOR_SCHEME') {$colors{'console'} = $val if is_int($val)}
+ elsif ($key eq 'GLOBAL_COLOR_SCHEME') {$colors{'global'} = $val if is_int($val)}
+ elsif ($key eq 'IRC_COLOR_SCHEME') {$colors{'irc-gui'} = $val if is_int($val)}
+ elsif ($key eq 'IRC_CONS_COLOR_SCHEME') {$colors{'irc-console'} = $val if is_int($val)}
+ elsif ($key eq 'IRC_X_TERM_COLOR_SCHEME') {$colors{'irc-virt-term'} = $val if is_int($val)}
+ elsif ($key eq 'VIRT_TERM_COLOR_SCHEME') {$colors{'virt-term'} = $val if is_int($val)}
# note: not using the old short SEP1/SEP2
elsif ($key eq 'SEP1_IRC') {$sep{'s1-irc'} = $val}
elsif ($key eq 'SEP1_CONSOLE') {$sep{'s1-console'} = $val}
- elsif ($key eq 'SEP[23]_IRC') {$sep{'s2-irc'} = $val}
- elsif ($key eq 'SEP[23]_CONSOLE') {$sep{'s2-console'} = $val}
+ elsif ($key eq 'SEP2_IRC') {$sep{'s2-irc'} = $val}
+ elsif ($key eq 'SEP2_CONSOLE') {$sep{'s2-console'} = $val}
# size
- elsif ($key eq 'COLS_MAX_CONSOLE') {$size{'console'} = int($val)}
- elsif ($key eq 'COLS_MAX_IRC') {$size{'irc'} = int($val)}
- elsif ($key eq 'COLS_MAX_NO_DISPLAY') {$size{'no-display'} = int($val)}
- elsif ($key eq 'INDENT') {$size{'indent'} = int($val)}
- elsif ($key eq 'INDENT_MIN') {$size{'indent-min'} = int($val)}
+ elsif ($key eq 'COLS_MAX_CONSOLE') {$size{'console'} = $val if is_int($val)}
+ elsif ($key eq 'COLS_MAX_IRC') {$size{'irc'} = $val if is_int($val)}
+ elsif ($key eq 'COLS_MAX_NO_DISPLAY') {$size{'no-display'} = $val if is_int($val)}
+ elsif ($key eq 'INDENT') {$size{'indent'} = $val if is_int($val)}
+ elsif ($key eq 'INDENT_MIN') {$size{'indent-min'} = $val if is_int($val)}
# print "mc: key: $key val: $val\n";
# print Dumper (keys %size) . "\n";
}
@@ -1269,6 +1287,8 @@ sub new {
}
sub run_debugger {
+ #require File::Find;
+ #import File::Find::Functions;
require File::Copy;
import File::Copy;
require File::Spec::Functions;
@@ -1304,7 +1324,7 @@ sub run_debugger {
proc_traverse_data();
}
else {
- print "Skipping /proc data collection. /proc not present, or empty.\n";
+ print "Skipping /proc data collection.\n";
}
print $line3;
}
@@ -1724,6 +1744,8 @@ sub system_files {
copy_files(\@files,'system-distro');
@files = main::globber('/etc/upstream[-_]{[rR]elease,[vV]ersion}/*');
copy_files(\@files,'system-distro');
+ @files = main::globber('/etc/calamares/branding/*/branding.desc');
+ copy_files(\@files,'system-distro');
@files = (
'/proc/1/comm',
'/proc/cpuinfo',
@@ -3044,6 +3066,18 @@ sub globber {
return @files;
}
+## NOTE: for perl pre 5.012 length(undef) returns warning
+# receives string, returns boolean 0/1 if integer
+sub is_int {
+ return 1 if (defined $_[0] && length($_[0]) && length($_[0]) == ($_[0] =~ tr/0123456789//));
+}
+
+# receives string, returns boolean 0/1 if numeric. tr/// is 4x faster than regex
+sub is_numeric {
+ return 1 if ( defined $_[0] && ( $_[0] =~ tr/0123456789//) >= 1 &&
+ length($_[0]) == ($_[0] =~ tr/0123456789.//) && ($_[0] =~ tr/.//) <= 1);
+}
+
# gets array ref, which may be undefined, plus join string
# this helps avoid debugger print errors when we are printing arrays
# which we don't know are defined or not null.
@@ -3065,9 +3099,10 @@ sub joiner {
}
# returns array of:
-# 0 - match string; 1 - search number; 2 - version string; 3 - Print name
-# 4 - console 0/1; 5 - 0/1 exit version loop at first iteration;
-# 6 - 0/1 write to stderr
+# 0 - match string; 1 - search number; 2 - version string [alt: file];
+# 3 - Print name; 4 - console 0/1;
+# 5 - 0/1 exit version loop at 1 [alt: if version=file replace value with \s];
+# 6 - 0/1 write to stderr [alt: if version=file, path for file]
# arg: 1 - program lower case name
sub program_values {
my ($app) = @_;
@@ -3095,17 +3130,22 @@ sub program_values {
'weechat-curses' => ['[0-9.]+',1,'-v','WeeChat',1,0,0],
'xchat-gnome' => ['[0-9.]+',2,'-v','X-Chat-Gnome',1,1,0],
'xchat' => ['[0-9.]+',2,'-v','X-Chat',1,1,0],
- ## Desktops / wm
+ ## Desktops / wm / compositors
'3dwm' => ['^3dwm',0,'0','3dwm',0,1,0], # unknown syntax
'9wm' => ['^9wm',3,'-version','9wm',0,1,0],
'afterstep' => ['^afterstep',3,'--version','AfterStep',0,1,0],
'amiwm' => ['^amiwm',0,'0','AmiWM',0,1,0],
'awesome' => ['^awesome',2,'--version','Awesome',0,1,0],
'blackbox' => ['^Blackbox',2,'--version','Blackbox',0,1,0],
+ 'bspwm' => ['^\S',1,'-v','bspwm',0,1,0],
'budgie' => ['^budgie-desktop',2,'--version','Budgie',0,1,0],
'cinnamon' => ['^cinnamon',2,'--version','Cinnamon',0,1,0],
'compiz' => ['^compiz',2,'--version','Compiz',0,1,0],
- 'dwm' => ['^dwm',1,'-v','Dwm',0,1,1],
+ 'deepin' => ['^Version',2,'file','Deepin',0,'=','/etc/deepin-version'],
+ 'deepin-metacity' => ['^metacity',2,'--version','Deepin-Metacity',0,1,0],
+ 'deepin-mutter' => ['^mutter',2,'--version','Deepin-Mutter',0,1,0],
+ 'deepin-wm' => ['^gala',0,'0','DeepinWM',0,1,0],
+ 'dwm' => ['^dwm',1,'-v','dwm',0,1,1],
'fluxbox' => ['^fluxbox',2,'--version','Fluxbox',0,1,0],
'flwm' => ['^flwm',0,'0','FLWM',0,0,1],
'fvwm' => ['^fvwm',2,'--version','FVWM',0,0,1],
@@ -3115,8 +3155,8 @@ sub program_values {
'gala' => ['^gala',2,'--version','gala',0,1,0], # super slow result
'gnome-about' => ['gnome',3,'--version','Gnome',0,1,0],
'gnome-shell' => ['gnome',3,'--version','Gnome',0,1,0],
- # fails to return version when in wm, but outside does. weird.
- 'herbstluftwm' => ['^herbstluftwm',2,'--version','herbstluftwm',0,1,0],
+ # with path, returns: /sbin/herbstluftwm [version]
+ 'herbstluftwm' => ['herbstluftwm',2,'--version','herbstluftwm',0,1,0],
'jwm' => ['^jwm',2,'--version','JWM',0,1,0],
# i3 version 4.13 (2016-11-08) © 2009 Michael Stapelberg and contributors
'i3' => ['^i3',3,'--version','i3',0,1,0],
@@ -3126,9 +3166,12 @@ sub program_values {
'kded2' => ['^KDE Development Platform:',4,'--version','KDE',0,1,0],
'kded3' => ['^KDE Development Platform:',4,'--version','KDE',0,1,0],
'kded4' => ['^KDE Development Platform:',4,'--version','KDE',0,1,0],
+ 'lumina' => ['^\S',1,'--version','Lumina',0,1,1],
'lxde' => ['^lxpanel',2,'--version','LXDE',0,1,0],
# command: lxqt-panel
'lxqt' => ['^lxqt-panel',2,'--version','LXQt',0,1,0],
+ 'lxqt-variant' => ['^lxqt-panel',0,'0','LXQt-Variant',0,1,0],
+ 'lxsession' => ['^lxsession',0,'0','lxsession',0,1,0],
'marco' => ['^marco',2,'--version','marco',0,1,0],
'matchbox' => ['^matchbox',0,'0','Matchbox',0,1,0],
'matchbox-window-manager' => ['^matchbox',2,'--help','Matchbox',0,0,0],
@@ -3144,10 +3187,12 @@ sub program_values {
'pekwm' => ['^pekwm',3,'--version','PekWM',0,1,0],
'plasmashell' => ['^plasmashell',2,'--version','KDE Plasma',0,1,0],
'qtdiag' => ['^qt',2,'--version','Qt',0,1,0],
+ 'razor' => ['^razor',0,'0','Razor-Qt',0,1,0],
'ratpoison' => ['^ratpoison',2,'--version','Ratpoison',0,1,0],
'sawfish' => ['^sawfish',3,'--version','Sawfish',0,1,0],
'scrotwm' => ['^scrotwm.*welcome.*',5,'-v','Scrotwm',0,1,1],
- 'spectrwm' => ['^spectrwm.*welcome.*wm',5,'-v','Spectrwm',0,1,0],
+ 'spectrwm' => ['^spectrwm.*welcome.*wm',5,'-v','Spectrwm',0,1,1],
+ 'twin' => ['^Twin:',2,'--version','Twin',0,0,0],
'twm' => ['^twm',0,'0','twm',0,1,0],
'unity' => ['^unity',2,'--version','Unity',0,1,0],
'windowlab' => ['^windowlab',2,'-about','WindowLab',0,1,0],
@@ -3161,6 +3206,11 @@ sub program_values {
# command: xfdesktop
'xfdesktop-toolkit' => ['Built[[:space:]]with[[:space:]]GTK',4,'--version','Gtk',0,1,0],
'xmonad' => ['^xmonad',2,'--version','XMonad',0,1,0],
+ ## display managers (dm)
+ 'gdm' => ['^gdm',2,'--version','gdm',0,1,0],
+ 'gdm3' => ['^gdm',2,'--version','gdm3',0,1,0],
+ 'lightdm' => ['^lightdm',2,'--version','lightdm',0,1,1],
+ 'slim' => ['slim version',3,'-v','slim',0,1,0],
## Shells
'bash' => ['^GNU[[:space:]]bash,[[:space:]]version',4,'--version','Bash',1,0,0],
'csh' => ['^tcsh',2,'--version','csh',1,0,0],
@@ -3194,7 +3244,7 @@ sub program_values {
# 5 - [optional] exit first find 0/1; 6 - [optional] 0/1 stderr output
sub program_version {
eval $start if $b_log;
- my ($app, $search, $num,$version,$exit,$b_stderr) = @_;
+ my ($app, $search, $num,$version,$exit,$stderr) = @_;
my ($cmd,$line,$output);
my $version_nu = '';
my $count = 0;
@@ -3232,21 +3282,32 @@ sub program_version {
}
}
# note, some wm/apps send version info to stderr instead of stdout
- if ( $b_stderr ) {
+ if ( $stderr && $stderr ne 'file' ) {
$cmd = "$app $version 2>&1";
}
# elsif ( $app eq 'csh' ){
# $app = 'tcsh';
# }
# quick debian/buntu hack until I find a universal way to get version for these
- elsif ( $app eq 'dash' ){
+ elsif ( $app =~ /dash$/ ){
+ $app =~ s/^.*\///;
$cmd = "dpkg -l $app 2>/dev/null";
}
else {
$cmd = "$app $version 2>/dev/null";
}
log_data('data',"version: $version num: $num search: $search command: $cmd") if $b_log;
- $output = qx($cmd);
+ # special case, in rare instances version comes from file
+ if ($version eq 'file' && $stderr){
+ return 0 unless -r $stderr;
+ my @data = reader($stderr,'strip');
+ @data = map {s/$exit/ /;$_} @data if $exit;
+ $output = join "\n",@data;
+ $exit = 100;
+ }
+ else {
+ $output = qx($cmd);
+ }
# print "$cmd : $output\n";
# sample: dwm-5.8.2, ©.. etc, why no space? who knows. Also get rid of v in number string
# xfce, and other, output has , in it, so dump all commas and parentheses
@@ -3265,7 +3326,7 @@ sub program_version {
# breaks version detection. A quick fix attempt is to just add 1 to $num
# to get the next value.
$version_nu = $data[$num+1] if $data[$num+1] && $version_nu =~ /version/i;
- $version_nu =~ s/(\([^)]+\)|,|dwm-|wmii2-|wmii-|\||\(|\))//g if $version_nu;
+ $version_nu =~ s/(\([^)]+\)|,|"|dwm-|wmii2-|wmii-|\||\(|\))//g if $version_nu;
# trim off leading v but only when followed by a number
$version_nu =~ s/^v([0-9])/$1/i if $version_nu;
# print "$version_nu\n";
@@ -4077,7 +4138,7 @@ sub get_options{
# to detect wan/lan, we have to use long form to get as much data as possible
$usb_level = ($show{'usb'} || $show{'network'}) ? 2 : 1;
}
- if ($bsd_type && ($show{'short'} || $show{'battery'} || $show{'cpu'} || $show{'cpu-basic'} ||
+ if ($bsd_type && ($show{'short'} || $show{'system'} || $show{'battery'} || $show{'cpu'} || $show{'cpu-basic'} ||
$show{'info'} || $show{'machine'} || $show{'process'} || $show{'ram'} || $show{'sensor'} ) ){
$b_sysctl = 1;
}
@@ -4184,7 +4245,7 @@ sub show_options {
['1', '-p', '--partitions-full', "Full $partition_string information (-P plus all other
detected ${partition_string}s)." ],
['1', '-P', '--partitions', "Basic $partition_string info. Shows, if detected:
- / /boot /home /opt /tmp /usr /var /var/log /var/tmp. Use -p to see all
+ / /boot /home /opt /tmp /usr /usr/home /var /var/log /var/tmp. Use -p to see all
mounted ${partition_string}s." ],
['1', '-r', '--repos', "Distro repository data. Supported repo types: APK,
APT, EOPKG, PACMAN, PACMAN-G2, PISI, PORTAGE, PORTS (BSDs), SLACKPKG,
@@ -4327,7 +4388,7 @@ sub show_options {
['2', '-R', '', "zfs-raid: portion allocated (used) by RAID devices/arrays.
md-raid: system md-raid support types (kernel support, read ahead, RAID events).
Hardware RAID rev, ports, specific vendor/product information." ],
- ['2', '-S', '', "Panel/shell info in desktop output, if in X (like lxpanel,
+ ['2', '-S', '', "Panel/tray/bar info in desktop output, if in X (like lxpanel,
xfce4-panel, mate-panel); (if available) dm version number, window manager
version number." ]
);
@@ -4637,7 +4698,14 @@ sub get_client_version {
elsif ( -f '~/.config/hexchat/xchat.conf' ){
@data = main::reader('~/.config/hexchat/xchat.conf','strip');
}
- $client{'version'} = main::awk(\@data,'version',2,'\s*=\s*');
+ if (@data){
+ $client{'version'} = main::awk(\@data,'version',2,'\s*=\s*');
+ }
+ # fingers crossed, hexchat won't open gui!!
+ if (!$client{'version'}) {
+ @data = main::grabber("$client{'name'} --version 2>/dev/null");
+ $client{'version'} = main::awk(\@data,'hexchat',2,'\s+');
+ }
$client{'name-print'} = 'HexChat';
}
# note: see legacy inxi konvi logic if we need to restore any of the legacy code.
@@ -4778,7 +4846,7 @@ sub check_modern_konvi {
# main::log_data('data',"name: $client{'name'} :: qdb: $client{'qdbus'} :: version: $client{'version'} :: konvi: $client{'konvi'} :: PPID: $ppid") if $b_log;
# sabayon uses /usr/share/apps/konversation as path
if ( -d '/usr/share/kde4/apps/konversation' || -d '/usr/share/apps/konversation' ){
- $pid = main::awk(\@ps_aux,'konversation',2,'\s+');
+ $pid = main::awk(\@ps_aux,'konversation -session',2,'\s+');
main::log_data('data',"pid: $pid") if $b_log;
$konvi = readlink ("/proc/$pid/exe");
$konvi =~ s/^.*\///; # basename
@@ -4867,7 +4935,7 @@ sub apply_filter {
}
sub arm_cleaner {
my ($item) = @_;
- $item =~ s/(\(?Device Tree\)?)//gi;
+ $item =~ s/(\([^\(]*Device Tree[^\)]*\))//gi;
$item =~ s/\s\s+/ /g;
$item =~ s/^\s+|\s+$//g;
return $item;
@@ -4941,7 +5009,7 @@ sub get_size {
my ($size,$b_int) = @_;
my (@data);
return ('','') if ! defined $size;
- if ($size !~ /^[0-9\.]+$/){
+ if (!is_numeric($size)){
$data[0] = $size;
$data[1] = '';
}
@@ -5049,6 +5117,17 @@ sub pci_long_filter {
return $string;
}
+# sometimes the pattern comes from unknown strings
+# which can contain regex characters, get rid of those
+sub regex_cleaner {
+ my ($string) = @_;
+ return if ! $string;
+ $string =~ s/(\{|\}|\(|\)|\[|\]|\|)/ /g;
+ $string =~ s/\s\s+/ /g;
+ $string =~ s/^\s+|\s+$//g;
+ return $string;
+}
+
sub row_defaults {
my ($type,$id) = @_;
$id ||= '';
@@ -5610,7 +5689,7 @@ sub card_data {
foreach (@pci){
$num = 1;
my @row = @$_;
- if ($row[0] =~ /^(audio|daudio|hdmi|multimedia)$/){
+ if ($row[0] =~ /^(audio|daudio|hdmi|hdmi-audio|multimedia)$/){
$j = scalar @rows;
my $driver = $row[9];
$driver ||= 'N/A';
@@ -5639,7 +5718,14 @@ sub card_data {
$rows[$j]{main::key($num++,'bus ID')} = (!$row[2] && !$row[3]) ? 'N/A' : "$row[2].$row[3]";
}
if ($extra > 1){
- $rows[$j]{main::key($num++,'chip ID')} = ($row[5]) ? "$row[5]:$row[6]" : $row[6];
+ my $chip_id = 'N/A';
+ if ($row[5] && $row[6]){
+ $chip_id = "$row[5]:$row[6]";
+ }
+ elsif ($row[6]){
+ $chip_id = $row[6];
+ }
+ $rows[$j]{main::key($num++,'chip ID')} = $chip_id;
}
}
#print "$row[0]\n";
@@ -5704,7 +5790,6 @@ sub usb_data {
if (@ids){
if (!$bsd_type && !$b_usb_check){
main::set_usb_data();
- $b_usb_check = 1;
}
}
main::log_data('dump','@ids',\@ids) if $b_log;
@@ -6041,16 +6126,11 @@ sub battery_data_sys {
$b_ma = 0;
$id = $item;
$id =~ s%/sys/class/power_supply/%%g;
- my $purpose = ($id =~ /^(BAT|CMB).*$/) ? 'primary': 'device';
- # don't create arrays of device data if it's not going to show
- next if $extra == 0 && $purpose ne 'primary';
$battery{$id} = ({});
- # NOTE: known ids: BAT[0-9] CMB[0-9]
- $battery{$id}{'purpose'} = $purpose;
foreach $file (@items){
$path = "$item/$file";
$value = (-f $path) ? (main::reader($path))[0]: '';
- # mains
+ # mains, plus in psu
if ($file eq 'type' && $value && lc($value) ne 'battery' ){
$battery{$id}{'purpose'} = 'mains';
}
@@ -6099,6 +6179,21 @@ sub battery_data_sys {
$battery{$id}{$file} = $value;
# print "$battery{$id}{$file}\n";
}
+ # note, too few data sets, there could be sbs-charger but not sure
+ if (!$battery{$id}{'purpose'}){
+ # NOTE: known ids: BAT[0-9] CMB[0-9]. arm may be like: sbs- sbm- but just check
+ # if the energy/charge values exist for this item, if so, it's a battery, if not,
+ # it's a device.
+ if ($id =~ /^(BAT|CMB).*$/i ||
+ ( $battery{$id}{'energy_full'} || $battery{$id}{'charge_full'} ||
+ $battery{$id}{'energy_now'} || $battery{$id}{'charge_now'} ||
+ $battery{$id}{'energy_full_design'} || $battery{$id}{'charge_full_design'} ) ){
+ $battery{$id}{'purpose'} = 'primary';
+ }
+ else {
+ $battery{$id}{'purpose'} = 'device';
+ }
+ }
# note:voltage_now fluctuates, which will make capacity numbers change a bit
# if any of these values failed, the math will be wrong, but no way to fix that
# tests show more systems give right capacity/charge with voltage_min_design
@@ -6330,7 +6425,7 @@ sub create_output_full {
$b_flags = 1;
}
if ($extra > 0 && !$bsd_type){
- my $bogomips = ($cpu{'bogomips'}) ? int($cpu{'bogomips'}) : 'N/A';
+ my $bogomips = (main::is_numeric($cpu{'bogomips'})) ? int($cpu{'bogomips'}) : 'N/A';
$rows[$j]{main::key($num++,'bogomips')} = $bogomips;
}
$j = scalar @rows;
@@ -7304,9 +7399,8 @@ sub get_boost_status {
}
sub arm_cpu_name {
eval $start if $b_log;
- my (%cpus,$compat);
- if ( -e '/sys/firmware/devicetree/base/cpus/cpu@1/compatible' ){
- my @working = main::globber('/sys/firmware/devicetree/base/cpus/cpu@*/compatible');
+ my (%cpus,$compat,@working);
+ if (@working = main::globber('/sys/firmware/devicetree/base/cpus/cpu@*/compatible')){
foreach my $file (@working){
$compat = (main::reader($file))[0];
# these can have non printing ascii... why? As long as we only have the
@@ -7316,6 +7410,17 @@ sub arm_cpu_name {
$cpus{$compat} = ($cpus{$compat}) ? ++$cpus{$compat}: 1;
}
}
+ # synthesize it, [4] will be like: cortex-a15-timer; sunxi-timer
+ # so far all with this directory show soc name, not cpu name for timer
+ elsif (! -d '/sys/firmware/devicetree/base' && @pci){
+ foreach my $ref (@pci){
+ @working = @$ref;
+ next if $working[0] ne 'timer' || !$working[4];
+ $working[4] =~ s/(-system)?-timer$//;
+ $compat = $working[4];
+ $cpus{$compat} = ($cpus{$compat}) ? ++$cpus{$compat}: 1;
+ }
+ }
main::log_data('dump','%cpus',\%cpus) if $b_log;
eval $end if $b_log;
return %cpus;
@@ -8220,14 +8325,14 @@ sub device_vendor {
['^ADTRON','^(ADTRON)','Adtron',''],
['^ASUS','^ASUS','ASUS',''],
['^ATP','^ATP[\s\-]','ATP',''],
- ['^Corsair','^Corsair','Corsair',''],
+ ['^(Corsair|Voyager)','^Corsair','Corsair',''],
['^(FUJITSU|MP)','^FUJITSU','Fujitsu',''],
# note: 2012: wdc bought hgst
['^(HGST)','^HGST','HGST (Hitachi)',''], # HGST HUA
- ['^(Hitachi|HDS|IC|HT|HU)','^Hitachi','Hitachi',''],
+ ['^(Hitachi|HDS|HDT|IC|HT|HU)','^Hitachi','Hitachi',''],
['^Hoodisk','^Hoodisk','Hoodisk',''],
['^(HP\b)','^HP','HP',''], # vb: VB0250EAVER but clashes with vbox; HP_SSD_S700_120G
- ['^(LSD|Lexar)','^Lexar','Lexar',''], # mmc-LEXAR_0xb016546c
+ ['^(LSD|Lexar|JumpDrive)','^Lexar','Lexar',''], # mmc-LEXAR_0xb016546c
# OCZSSD2-2VTXE120G is OCZ-VERTEX2_3.5
['^(OCZ|APOC|D2|DEN|DEN|DRSAK|EC188|FTNC|GFGC|MANG|MMOC|NIMC|NIMR|PSIR|TALOS2|TMSC|TRSAK)','^OCZ[\s\-]','OCZ',''],
['^OWC','^OWC[\s\-]','OWC',''],
@@ -8245,12 +8350,15 @@ sub device_vendor {
['^BUFFALO','^BUFFALO','Buffalo',''],
['^CHN\b','','Zheino',''],
['^Colorful\b','^Colorful','Colorful',''],
- ['^DREVO\b','','Drevo',''],
+ ['^DREVO\b','^DREVO','Drevo',''],
+ ['^(Eaget|V8$)','^Eaget','Eaget',''],
['^EXCELSTOR','^EXCELSTOR( TECHNOLOGY)?','Excelstor',''],
['^FASTDISK','^FASTDISK','FASTDISK',''],
['^FORESEE','^FORESEE','Foresee',''],
['^GALAX\b','^GALAX','GALAX',''],
+ ['^Galaxy\b','^Galaxy','Galaxy',''],
['^Generic','^Generic','Generic',''],
+ ['^Gloway','^Gloway','Gloway',''],
['^GOODRAM','^GOODRAM','GOODRAM',''],
# supertalent also has FM: |FM
['^(G[\.]?SKILL)','^G[\.]?SKILL','G.SKILL',''],
@@ -8259,8 +8367,10 @@ sub device_vendor {
['^Imation','^Imation(\sImation)?','Imation',''], # Imation_ImationFlashDrive
['^(InnoDisk|Innolite)','^InnoDisk( Corp.)?','InnoDisk',''],
['^Innostor','^Innostor','Innostor',''],
- ['^Intenso','^Intenso','Intenso',''],
+ ['^(Intenso|Rainbow Line)','^Intenso','Intenso',''],
['^KingDian','^KingDian','KingDian',''],
+ ['^KingMAX','^KingMAX','KingMAX',''],
+ ['^KINGSHARE','^KINGSHARE','KingShare',''],
['^(LITE[\-]?ON[\s\-]?IT)','^LITE[\-]?ON[\s\-]?IT','LITE-ON IT',''], # LITEONIT_LSS-24L6G
['^(LITE[\-]?ON|PH6)','^LITE[\-]?ON','LITE-ON',''], # PH6-CE240-L
['^M-Systems','^M-Systems','M-Systems',''],
@@ -8279,7 +8389,7 @@ sub device_vendor {
['^SigmaTel','^SigmaTel','SigmaTel',''],
['^SPPC','','Silicon Power',''],
['^(SK\s?HYNIX|HFS)','^SK\s?HYNIX','SK Hynix',''], # HFS128G39TND-N210A
- ['^hynix','hynix','Hynix',''],# nvme middle of string, must be after sk hynix
+ ['hynix','hynix','Hynix',''],# nvme middle of string, must be after sk hynix
['^SH','','Smart Modular Tech.',''],
['^(SMART( Storage Systems)?|TX)','^(SMART( Storage Systems)?)','Smart Storage Systems',''],
['^(S[FR]-|Sony)','^Sony','Sony',''],
@@ -8512,7 +8622,7 @@ sub card_data {
$num = 1;
my @row = @$_;
#print "$row[0] $row[3]\n";
- if ($row[3] == 0 && ( $row[0] =~ /^(vga|disp|display|3d|fb|gpu|hdmi)$/ ) ){
+ if ($row[3] == 0 && ( $row[0] =~ /^(vga|disp|display|display-port-controller|3d|fb|gpu|hdmi|mali)$/ ) ){
#print "$row[0] $row[3]\n";
$j = scalar @rows;
$driver = $row[9];
@@ -8969,9 +9079,14 @@ sub x_drivers {
eval $end if $b_log;
return @driver_data;
}
+# fallback if no glx x version data found
sub x_version {
eval $start if $b_log;
my ($version,@data,$program);
+ # load the extra X paths, it's important that these are first, because
+ # later Xorg versions show error if run in console or ssh if the true path
+ # is not used.
+ @paths = ( qw(/usr/lib/xorg /usr/lib/xorg-server /usr/X11R6/bin), @paths );
# IMPORTANT: both commands send version data to stderr!
if ($program = main::check_program('Xorg')){
@data = main::grabber("$program -version 2>&1");
@@ -8979,21 +9094,22 @@ sub x_version {
elsif ($program = main::check_program('X')){
@data = main::grabber("$program -version 2>&1");
}
+ #print join('^ ', @paths), " :: $program\n";
#print Data::Dumper::Dumper \@data;
if (@data){
foreach (@data){
if (/^X.org X server/i){
- my @working = split /\s+/, $_;
- $version = $working[3];
+ $version = (split /\s+/, $_)[3];
last;
}
elsif (/^X Window System Version/i) {
- my @working = split /\s+/, $_;
- $version = $working[4];
+ $version = (split /\s+/, $_)[4];
last;
}
}
}
+ # remove extra X paths
+ @paths = grep { !/xorg|X11R6/ } @paths;
eval $end if $b_log;
return $version;
}
@@ -9255,9 +9371,8 @@ sub create_output_soc {
$rows[$j]{main::key($num++,'System')} = $soc_machine{'model'};
$system = 'details';
}
- my $device = $soc_machine{'device'};
- $device ||= 'N/A';
- $rows[$j]{main::key($num++,$system)} = $device;
+ $soc_machine{'device'} ||= 'N/A';
+ $rows[$j]{main::key($num++,$system)} = $soc_machine{'device'};
}
# we're going to print N/A for 0000 values sine the item was there.
if ($soc_machine{'firmware'}){
@@ -9373,10 +9488,8 @@ sub machine_data_soc {
if ( $model ){
$model = main::dmi_cleaner($model);
$model = (split /\x01|\x02|\x03|\x00/, $model)[0] if $model;
- # idea was to use only first part of string, but now try using all
- #my (@result) = ();
- #@result = split(/\s+/, $soc_machine{'device'}) if $soc_machine{'device'};
- if ( !$soc_machine{'device'} || ($model && $model !~ /$soc_machine{'device'}/i) ){
+ my $device_temp = main::regex_cleaner($soc_machine{'device'});
+ if ( !$soc_machine{'device'} || ($model && $model !~ /$device_temp/i) ){
$model = main::arm_cleaner($model);
$soc_machine{'model'} = $model;
}
@@ -10003,7 +10116,7 @@ sub advanced_data_sys {
$b_wifi = 1 if !$b_wifi && ( -e "$_$if/wireless" || $if =~ /^(wl|ww)/);
if (!$b_wifi && $state ne 'down' && $state ne 'no'){
# make sure the value is strictly numeric before appending Mbps
- $speed = ($speed =~ /^[0-9]+$/) ? "$speed Mbps" : $speed;
+ $speed = ( main::is_int($speed) ) ? "$speed Mbps" : $speed;
$row[0]{main::key($num++,'speed')} = $speed;
$row[0]{main::key($num++,'duplex')} = $duplex;
}
@@ -10071,7 +10184,7 @@ sub advanced_data_bsd {
# for 'down' string in that to skip showing speed/duplex
if (!$b_wifi && $state ne 'down' && $state ne 'no'){
# make sure the value is strictly numeric before appending Mbps
- $speed = ($speed =~ /^[0-9]+$/) ? "$speed Mbps" : $speed;
+ $speed = ( main::is_int($speed) ) ? "$speed Mbps" : $speed;
$row[0]{main::key($num++,'speed')} = $speed;
$row[0]{main::key($num++,'duplex')} = $duplex;
}
@@ -10708,9 +10821,10 @@ sub partition_data {
#Filesystem 1024-blocks Used Available Capacity iused ifree %iused Mounted on
else {
$cols = 8;
- $b_fake_map = 1;
($back_size,$back_used) = (7,6);
}
+ # turns out freebsd uses this junk too
+ $b_fake_map = 1;
}
# busybox only supports -k and -P, openbsd, darwin
if (!@partitions_working){
@@ -10739,7 +10853,9 @@ sub partition_data {
# stupid apple bullshit
$_ =~ s/^map\s+([\S]+)/map:\/$1/ if $b_fake_map;
my @row = split /\s+/, $_;
- if ($row[0] =~ /$filters/ || $row[0] =~ /^ROOT/i || ($b_fs && $row[1] eq 'tmpfs')){
+ # autofs is a bsd thing, has size 0
+ if ($row[0] =~ /$filters/ || $row[0] =~ /^ROOT/i ||
+ ($b_fs && ($row[2] == 0 || $row[1] eq 'tmpfs' || $row[1] eq 'autofs' ))){
next;
}
$dev_base = '';
@@ -10779,12 +10895,12 @@ sub partition_data {
}
# this handles yet another fredforfaen special case where a mounted drive
# has the search string in its name
- if ($row[-1] =~ /^\/$|^\/boot$|^\/var$|^\/var\/tmp$|^\/var\/log$|^\/home$|^\/opt$|^\/tmp$|^\/usr$/){
+ if ($row[-1] =~ /^\/$|^\/boot$|^\/var$|^\/var\/tmp$|^\/var\/log$|^\/home$|^\/opt$|^\/tmp$|^\/usr$|^\/usr\/home$/){
$b_load = 1;
# note, older df in bsd do not have file system column
$type = 'main';
}
- elsif ($row[$cols] !~ /^\/$|^\/boot$|^\/var$|^\/var\/tmp$|^\/var\/log$|^\/home$|^\/opt$|^\/tmp$|^\/usr$|^filesystem/){
+ elsif ($row[$cols] !~ /^\/$|^\/boot$|^\/var$|^\/var\/tmp$|^\/var\/log$|^\/home$|^\/opt$|^\/tmp$|^\/usr$|^\/usr\/home$|^filesystem/){
$b_load = 1;
$type = 'secondary';
}
@@ -11579,6 +11695,7 @@ sub mdraid_data {
#$mdstat = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/md-rebuild-1.txt";
#$mdstat = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/md-2-mirror-fserver2-1.txt";
#$mdstat = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/md-2-raid10-abucodonosor.txt";
+ # $mdstat = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/md-2-raid10-ant.txt";
my @working = main::reader($mdstat,'strip');
#print Data::Dumper::Dumper \@working;
my (@data,@mdraid,@temp,$b_found,$system,$unused);
@@ -11604,7 +11721,7 @@ sub mdraid_data {
my $component_string = $5;
@temp = ();
$raid =~ s/^raid1$/mirror/;
- $raid =~ s/^raid/raid-/;
+ $raid =~ s/^raid/raid-/;
$raid = 'mirror' if $raid eq '1';
# remember, these include the [x] id, so remove that for disk/unmounted
my @components = split /\s+/, $component_string;
@@ -11746,7 +11863,7 @@ sub zfs_data {
# this second is a single device not in an array
# ada0s2 25.9G 14.6G 11.3G - 0% 56%
# gptid/3838f796-5c46-11e6-a931-d05099ac4dc2 - - - - - -
- elsif ($row[1] =~ /^([a-z0-9]+[0-9]+|([\S]+)\/.*)$/ &&
+ elsif ($row[1] =~ /^(sd[a-z]|[a-z0-9]+[0-9]+|([\S]+)\/.*)$/ &&
($row[2] eq '-' || $row[2] =~ /^[0-9\.]+[MGTP]$/ )){
$row[1] =~ /^([a-z0-9]+[0-9]+|([\S]+)\/.*)\s*(DEGRADED|FAULTED|OFFLINE)?$/;
my $working = $1;
@@ -12441,6 +12558,7 @@ sub get_repos_linux {
my $pacman_g2 = '/etc/pacman-g2.conf';
my $pisi_dir = '/etc/pisi/';
my $portage_dir = '/etc/portage/repos.conf/';
+ my $portage_gentoo_dir = '/etc/portage-gentoo/repos.conf/';
my $slackpkg = '/etc/slackpkg/mirrors';
my $slackpkg_plus = '/etc/slackpkg/slackpkgplus.conf';
my $yum_conf = '/etc/yum.conf';
@@ -12727,8 +12845,8 @@ sub get_repos_linux {
# print Data::Dumper::Dumper \@rows;
}
# gentoo
- if (-d $portage_dir && main::check_program('emerge')){
- @files = main::globber("$portage_dir*.conf");
+ if ( (-d $portage_dir || -d $portage_gentoo_dir ) && main::check_program('emerge')){
+ @files = (main::globber("$portage_dir*.conf"),main::globber("$portage_gentoo_dir*.conf"));
$repo = 'portage';
if (@files){
foreach (sort @files){
@@ -12755,8 +12873,10 @@ sub get_repos_linux {
$url = $2;
}
# note: enabled = 1. enabled = 0 means disabled
- elsif ($line =~ /^auto-sync\s*=\s*([01])/){
+ elsif ($line =~ /^auto-sync\s*=\s*(0|1|No|Yes)/){
$enabled = $1;
+ $enabled =~ s/No/0/;
+ $enabled =~ s/Yes/1/;
}
# print out the line if all 3 values are found, otherwise if a new
# repoTitle is hit above, it will print out the line there instead
@@ -13198,7 +13318,7 @@ sub create_output {
my $ambient_temp = $sensors{'ambient-temp'} . $temp_unit;
$rows[$j]{main::key($num++,'ambient')} = $ambient_temp;
}
- if (scalar @gpu == 1){
+ if (scalar @gpu == 1 && defined $gpu[0]{'temp'}){
my $gpu_temp = $gpu[0]{'temp'};
my $gpu_type = $gpu[0]{'type'};
my $gpu_unit = (defined $gpu[0]{'temp-unit'} && $gpu_temp ) ? " $gpu[0]{'temp-unit'}" : ' C';
@@ -13305,6 +13425,13 @@ sub ipmi_data {
$temp_working,$working_unit);
$program ||= 'ipmi-sensors'; # only for debugging, will always exist if reaches here
my ($b_ipmitool,$i_key,$i_value,$i_unit);
+ #$file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmitool-sensors-archerseven-1.txt";$program='ipmitool';
+ #$file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmitool-sensors-crazy-epyc-1.txt";$program='ipmitool';
+ #$file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmitool-sensors-RK016013.txt";$program='ipmitool';
+ #$file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmi-sensors-crazy-epyc-1.txt";
+ #$file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmi-sensors-lathander.txt";
+ #$file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmi-sensors-zwerg.txt";
+ #@data = main::reader($file);
if ($program =~ /ipmi-sensors$/){
$cmd = $program;
($b_ipmitool,$i_key,$i_value,$i_unit) = (0,1,3,4);
@@ -13314,21 +13441,16 @@ sub ipmi_data {
($b_ipmitool,$i_key,$i_value,$i_unit) = (1,0,1,2);
}
@data = main::grabber("$cmd 2>/dev/null");
- #$file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmitool-sensors-archerseven-1.txt";
- #$file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmitool-sensors-crazy-epyc-1.txt";
- #$file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmi-sensors-crazy-epyc-1.txt";$program='ipmi-sensors';
- #$file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmitool-sensors-RK016013.txt";$program='ipmi-sensors';
- #$file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmi-sensors-lathander.txt";
- #$file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmi-sensors-zwerg.txt";
- #@data = main::reader($file);
+ # print join ("\n", @data), "\n";
return if ! @data;
foreach (@data){
next if /^\s*$/;
# print "$_\n";
@row = split /\s*\|\s*/, $_;
- next if $row[$i_value] !~ /^[0-9\.]+$/i;
+ #print "$row[$i_value]\n";
+ next if !main::is_numeric($row[$i_value]);
# print "$row[$i_key] - $row[$i_value]\n";
- if ($row[$i_key] =~ /^(System[\s_]Temp|System[\s_]?Board)$/i){
+ if (!$sensors{'mobo-temp'} && $row[$i_key] =~ /^(MB_TEMP[0-9]|System[\s_]Temp|System[\s_]?Board)$/i){
$sensors{'mobo-temp'} = int($row[$i_value]);
$working_unit = $row[$i_unit];
$working_unit =~ s/degrees\s// if $b_ipmitool;
@@ -13387,7 +13509,7 @@ sub ipmi_data {
}
$sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
}
- elsif (!$sensors{'sodimm-temp'} && $row[$i_key] =~ /^(DIMM-[0-9][A-Z]?)$/i){
+ elsif (!$sensors{'sodimm-temp'} && $row[$i_key] =~ /^(DIMM[-_]([A-Z][0-9][-_])?[A-Z]?[0-9][A-Z]?)$/i){
$sensors{'sodimm-temp'} = int($row[$i_value]);
$working_unit = $row[$i_unit];
$working_unit =~ s/degrees\s// if $b_ipmitool;
@@ -13403,7 +13525,6 @@ sub ipmi_data {
# note: cpu/mobo/ps are 1/2/3
elsif ($row[$i_key] =~ /^(SYS[\s_])?FAN[\s_]?([0-9A-F]+)/i) {
$sys_fan_nu = hex($2);
- next if $row[$i_value] !~ /^[0-9\.]+$/;
$fan_working = int($row[$i_value]);
$sensors{'fan-default'} = () if !$sensors{'fan-default'};
if ( $sys_fan_nu =~ /^([0-9]+)$/ ) {
@@ -13474,7 +13595,7 @@ sub lm_sensors_data {
#my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/sensors-asus-chassis-1.txt";
#my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/sensors-devnull-1.txt";
#@sensors_data = main::reader($file);
- #print @sensors_data;
+ # print join ("\n", @sensors_data), "\n";
@sensors_data = map {$_ =~ s/\s*:\s*\+?/:/;$_} @sensors_data;
foreach (@sensors_data){
# we get this from gpu_data()
@@ -14239,6 +14360,8 @@ sub unmounted_data {
# need to exclude loop type file systems, squashfs for example
# NOTE: nvme needs special treatment because the main device is: nvme0n1
# note: $working[2] != 1 is wrong, it's not related
+ # note: for zfs using /dev/sda no partitions, this will also remove those from
+ # the unmounted report because sdb is found in sdb1, this is acceptable
if ( $working[-1] !~ /^(nvme[0-9]+n|mmcblk|mtdblk|mtdblock)[0-9]+$/ &&
$working[-1] =~ /[a-z][0-9]+$|dm-[0-9]+$/ && $working[-1] !~ /loop/ &&
!(grep {$working[-1] =~ /$_/} @mounted)){
@@ -14386,7 +14509,7 @@ sub usb_data {
@row = split /:/, $line;
next if ! defined $row[0];
if ($row[0] eq 'bcdUSB' && defined $row[1]){
- $speed = ($row[1] =~ /^[0-9,\.]+$/) ? sprintf("%1.1f",$row[1]) : $row[1];
+ $speed = ( main::is_numeric($row[1]) ) ? sprintf("%1.1f",$row[1]) : $row[1];
}
elsif ($row[0] eq '~bInterfaceProtocol' && $row[2] ){
$protocol = $row[2];
@@ -15056,7 +15179,8 @@ sub get_compiler_version_linux {
# 6 - wm version
{
package DesktopEnvironment;
-my ($b_xprop,$desktop_session,$kde_session_version,$xdg_desktop,@desktop,@data,@xprop);
+my ($b_gtk,$b_qt,$b_xprop,$desktop_session,$kde_session_version,$xdg_desktop,
+@desktop,@data,@xprop);
sub get {
# NOTE $XDG_CURRENT_DESKTOP envvar is not reliable, but it shows certain desktops better.
# most desktops are not using it as of 2014-01-13 (KDE, UNITY, LXDE. Not Gnome)
@@ -15082,6 +15206,8 @@ sub get {
if ($b_display && !$b_force_display && $extra > 1){
get_wm();
}
+ # set_gtk_data if $b_gtk && $extra > 1;
+ set_qt_data() if $b_qt && $extra > 1;
main::log_data('dump','@desktop', \@desktop) if $b_log;
# ($b_xprop,$kde_session_version,$xdg_desktop,@data,@xprop) = undef;
return @desktop;
@@ -15177,58 +15303,44 @@ sub get_env_de_data {
$desktop[3] = main::awk(\@version_data,'^Qt:',2,'\s+') if @version_data;
}
}
- elsif ($xdg_desktop eq 'unity'){
- @data = main::program_values('unity');
- $desktop[0] = $data[3];
- $desktop[0] ||= 'Unity';
- $desktop[1] = main::program_version('cinnamon',$data[0],$data[1],$data[2],$data[5],$data[6]);
- #set_gtk_data() if $extra > 1;
- }
- elsif ( $xdg_desktop =~ /budgie/ ){
- @data = main::program_values('budgie');
- $desktop[0] = $data[3];
- $desktop[1] = main::program_version('budgie-desktop',$data[0],$data[1],$data[2],$data[5],$data[6]);
- }
- # debian package: lxde-core.
- # NOTE: some distros fail to set XDG data for root
- elsif ( $xdg_desktop =~ /^(lxde|razor|lxqt)$/ || (grep {/^(razor-session|lxsession|lxqt-session)$/} @ps_gui)){
- # note: openbox-lxde --version may be present, but returns openbox data
- if ($xdg_desktop eq 'lxde' || (grep {/^lxsession$/} @ps_gui )){
- @data = main::program_values('lxde');
- $desktop[0] = $data[3];
- $desktop[1] = main::program_version('lxpanel',$data[0],$data[1],$data[2],$data[5],$data[6]);
- }
- # NOTE: lxqt-about opens a gui dialog
- elsif ($xdg_desktop eq 'razor' || $xdg_desktop eq 'lxqt' || (grep {/^(razor-desktop|lxqt-session)$/} @ps_gui)) {
- if (grep {/^lxqt-session$/} @ps_gui){
- @data = main::program_values('lxqt');
+ if (!$desktop[0]){
+ # 1 equals 1/0; 2 env var search; 3 values; 4 version; 5 - gtk tk; 6 - qt tk
+ my @desktops =(
+ [1,'unity','unity','cinnamon',0,0],
+ [0,'budgie','budgie','budgie-desktop',0,0],
+ # debian package: lxde-core.
+ # NOTE: some distros fail to set XDG data for root
+ [1,'lxde','lxde','lxpanel',0,0,'^lxsession$'],
+ [1,'razor','razor','razor-session',0,1,'^razor-session$'],
+ # BAD: lxqt-about opens dialogue, sigh.
+ # Checked, lxqt-panel does show same version as lxqt-about
+ [1,'lxqt','lxqt','lxqt-panel',0,1,'^lxqt-session$'],
+ [0,'^(razor|lxqt)$','lxqt-variant','lxqt-panel',0,1,'^(razor-session|lxqt-session)$'],
+ # note, X-Cinnamon value strikes me as highly likely to change, so just
+ # search for the last part
+ [0,'cinnamon','cinnamon','cinnamon',0,0],
+ # these two so far have no cli version data
+ [1,'pantheon','pantheon','pantheon',0,0],
+ [1,'lumina','lumina','lumina-desktop',0,1],
+ [1,'deepin','deepin','dde-desktop',0,1],
+ );
+ foreach my $ref (@desktops){
+ my @item = @$ref;
+ # Check if in xdg_desktop OR desktop_session OR if in $item[6] and in ps_gui
+ if ( (($item[0] && ($xdg_desktop eq $item[1] || $desktop_session eq $item[1] )) ||
+ (!$item[0] && ($xdg_desktop =~ /$item[1]/ || $desktop_session =~ /$item[1]/ )) ) ||
+ ($item[6] && @ps_gui && (grep {/$item[6]/} @ps_gui) ) ){
+ @data = main::program_values($item[2]);
$desktop[0] = $data[3];
- # BAD: lxqt-about opens dialogue, sigh
- $desktop[1] = main::program_version('lxqt-panel',$data[0],$data[1],$data[2],$data[5],$data[6]);
- }
- elsif (grep {/^razor-session$/} @ps_gui){
- $desktop[0] = 'Razor-Qt';
- }
- else {
- $desktop[0] = 'LX-Qt-Variant';
+ $b_gtk = $item[4];
+ $b_qt = $item[5];
+ if ($data[1] && $data[2]){
+ $desktop[1] = main::program_version($item[3],$data[0],$data[1],$data[2],$data[5],$data[6]);
+ }
+ last;
}
- set_qt_data() if $extra > 1;
}
}
- # note, X-Cinnamon value strikes me as highly likely to change, so just
- # search for the last part
- elsif ( $xdg_desktop =~ /cinnamon/ ){
- @data = main::program_values('cinnamon');
- $desktop[0] = $data[3];
- $desktop[1] = main::program_version('cinnamon',$data[0],$data[1],$data[2],$data[5],$data[6]);
- #set_gtk_data() if $extra > 1;
- }
- elsif ($xdg_desktop eq 'pantheon' || $desktop_session eq 'pantheon'){
- @data = main::program_values('pantheon');
- $desktop[0] = $data[3];
- #$desktop[1] = main::program_version('pantheon',$data[0],$data[1],$data[2],$data[5],$data[6]);
- #set_gtk_data() if $extra > 1;
- }
eval $end if $b_log;
}
sub get_env_xprop_de_data {
@@ -15246,7 +15358,7 @@ sub get_env_xprop_de_data {
@data = main::program_values('cinnamon');
$desktop[0] = $data[3];
$desktop[1] = main::program_version('cinnamon',$data[0],$data[1],$data[2],$data[5],$data[6]);
- #set_gtk_data() if $extra > 1;
+ # $b_gtk = 1;
$desktop[0] ||= 'Cinnamon';
}
elsif ($xdg_desktop eq 'mate' || ( $b_xprop && main::awk(\@xprop,'_marco') )){
@@ -15259,7 +15371,7 @@ sub get_env_xprop_de_data {
$desktop[0] = $data[3];
$desktop[1] = main::program_version($program,$data[0],$data[1],$data[2],$data[5],$data[6]);
}
- #set_gtk_data() if $extra > 1;
+ # $b_gtk = 1;
$desktop[0] ||= 'MATE';
}
# note, GNOME_DESKTOP_SESSION_ID is deprecated so we'll see how that works out
@@ -15275,7 +15387,7 @@ sub get_env_xprop_de_data {
@data = main::program_values('gnome-shell');
$desktop[1] = main::program_version('gnome-shell',$data[0],$data[1],$data[2],$data[5],$data[6]);
}
- # set_gtk_data() if $extra > 1;
+ # $b_gtk = 1;
$desktop[0] = ( $data[3] ) ? $data[3] : 'Gnome';
}
eval $end if $b_log;
@@ -15288,9 +15400,6 @@ sub get_xprop_de_data {
# alternate: xfce4-about --version > xfce4-about 4.10.0 (Xfce 4.10)
# note: some distros/wm (e.g. bunsen) set xdg to xfce to solve some other
# issues so don't test for that. $xdg_desktop eq 'xfce'
- # the sequence here matters, some desktops like icewm, razor, let you set different
- # wm, so we want to get the main controlling desktop first, then fall back to the wm
- # detections. get_wm() will handle alternate wm detections.
if ((main::check_program('xfdesktop')) && main::awk(\@xprop,'^(xfdesktop|xfce)' )){
# this is a very expensive test that doesn't usually result in a find
# talk to xfce to see what id they will be using for xfce 5
@@ -15336,61 +15445,38 @@ sub get_xprop_de_data {
$desktop[1] = (split /"/, $desktop[1])[1] if $desktop[1];
$desktop[1] = (split /\s+/, $desktop[1])[1] if $desktop[1];
}
- # must come right after xfce
- elsif (main::check_program('icewm') && main::awk(\@xprop,'icewm' )){
- @data = main::program_values('icewm');
- $desktop[0] = $data[3];
- $desktop[1] = main::program_version('icewm',$data[0],$data[1],$data[2],$data[5],$data[6]);
- }
- # debian package: i3-wm
- elsif (main::check_program('i3') && main::awk(\@xprop,'^i3_' )){
- @data = main::program_values('i3');
- $desktop[0] = $data[3];
- $desktop[1] = main::program_version('i3',$data[0],$data[1],$data[2],$data[5],$data[6]);
- }
- elsif (main::check_program('mwm') && main::awk(\@xprop,'^_motif' )){
- @data = main::program_values('mwm');
- $desktop[0] = $data[3];
- # $desktop[1] = main::program_version('mwm',$data[0],$data[1],$data[2],$data[5],$data[6]);
- }
- # debian package name: wmaker
- elsif (main::check_program('WindowMaker') && main::awk(\@xprop,'^_?windowmaker' )){
- @data = main::program_values('wmaker');
- $desktop[0] = $data[3];
- $desktop[1] = main::program_version('wmaker',$data[0],$data[1],$data[2],$data[5],$data[6]);
- }
- elsif (main::check_program('wm2') && main::awk(\@xprop,'^_wm2' )){
- @data = main::program_values('wm2');
- $desktop[0] = $data[3];
- $desktop[1] = main::program_version('wm2',$data[0],$data[1],$data[2],$data[5],$data[6]);
- }
- elsif (main::check_program('herbstluftwm') && main::awk(\@xprop,'herbstluftwm' )){
- @data = main::program_values('herbstluftwm');
- $desktop[0] = $data[3];
- $desktop[1] = main::program_version('herbstluftwm',$data[0],$data[1],$data[2],$data[5],$data[6]);
- }
- elsif ( (main::check_program('blackbox') || main::check_program('fluxbox')) && main::awk(\@xprop,'blackbox_pid' )){
- if (@ps_gui && (grep {/^fluxbox$/} @ps_gui )){
- @data = main::program_values('fluxbox');
- $desktop[0] = $data[3];
- $desktop[1] = main::program_version('fluxbox',$data[0],$data[1],$data[2],$data[5],$data[6]);
- }
- else {
- @data = main::program_values('blackbox');
- $desktop[0] = $data[3];
- $desktop[1] = main::program_version('blackbox',$data[0],$data[1],$data[2],$data[5],$data[6]);
+ # the sequence here matters, some desktops like icewm, razor, let you set different
+ # wm, so we want to get the main controlling desktop first, then fall back to the wm
+ # detections. get_ps_de_data() and get_wm() will handle alternate wm detections.
+ if (!$desktop[0]){
+ # 1 check program; 2 xprop search; 3 values; 4 version; 5 - optional: ps_gui search
+ my @desktops =(
+ ['icewm','icewm','icewm','icewm'],
+ # debian package: i3-wm
+ ['i3','i3','i3','i3'],
+ ['mwm','^_motif','mwm','mwm'],
+ # debian package name: wmaker
+ ['WindowMaker','^_?windowmaker','wmaker','wmaker'],
+ ['wm2','^_wm2','wm2','wm2'],
+ ['herbstluftwm','herbstluftwm','herbstluftwm','herbstluftwm'],
+ ['fluxbox','blackbox_pid','fluxbox','fluxbox','^fluxbox$'],
+ ['blackbox','blackbox_pid','blackbox','blackbox'],
+ ['openbox','openbox_pid','openbox','openbox'],
+ ['amiwm','amiwm','amiwm','amiwm'],
+ );
+ foreach my $ref (@desktops){
+ my @item = @$ref;
+ if (main::check_program($item[0]) && main::awk(\@xprop,$item[1]) &&
+ (!$item[4] || (@ps_gui && (grep {/$item[4]/} @ps_gui ))) ){
+ @data = main::program_values($item[2]);
+ $desktop[0] = $data[3];
+ if ($data[1] && $data[2]){
+ $desktop[1] = main::program_version($item[3],$data[0],$data[1],$data[2],$data[5],$data[6]);
+ }
+ last;
+ }
}
}
- elsif (main::check_program('openbox') && main::awk(\@xprop,'openbox_pid' )){
- @data = main::program_values('openbox');
- $desktop[0] = $data[3];
- $desktop[1] = main::program_version('openbox',$data[0],$data[1],$data[2],$data[5],$data[6]);
- }
- elsif (main::check_program('amiwm') && main::awk(\@xprop,'amiwm' )){
- @data = main::program_values('amiwm');
- $desktop[0] = $data[3];
- #$desktop[1] = main::program_version('openbox',$data[0],$data[1],$data[2],$data[5],$data[6]);
- }
# need to check starts line because it's so short
eval $end if $b_log;
}
@@ -15399,10 +15485,10 @@ sub get_ps_de_data {
my ($program,@version_data);
main::set_ps_gui() if !$b_ps_gui;
if (@ps_gui){
- # 1 check program; 2 search; 3 values; 4 version; 5 -optional: print value
+ # 1 check program; 2 ps_gui search; 3 values; 4 version
my @desktops =(
['fluxbox','fluxbox','fluxbox','fluxbox'],
- ['fvwm-crystal','fvwm-crystal','fvwm-crystal','fvwm'],
+ ['fvwm-crystal','fvwm.*-crystal','fvwm-crystal','fvwm'],
['fvwm2','fvwm2','fvwm2','fvwm2'],
['fvwm','fvwm','fvwm','fvwm'],
['pekwm','pekwm','pekwm','pekwm'],
@@ -15429,6 +15515,7 @@ sub get_ps_de_data {
['matchbox-window-manager','matchbox-window-manager',
'matchbox-window-manager','matchbox-window-manager'],
['afterstep','afterstep','afterstep','afterstep'],
+ ['bspwm','bspwm','bspwm','bspwm'],
['WindowMaker','WindowMaker','wmaker','wmaker'],
['windowlab','windowlab','windowlab','windowlab'],
['xmonad','xmonad','xmonad','xmonad'],
@@ -15462,6 +15549,7 @@ sub set_qt_data {
elsif ($program = main::check_program("kded") ){$kde_version = '';}
}
# alternate: qt4-default, qt4-qmake or qt5-default, qt5-qmake
+ # often this exists, is executable, but actually is nothing, shows error
if (!$desktop[3] && ($program = main::check_program("qmake"))){
@version_data = main::grabber("$program --version 2>/dev/null");
$desktop[2] = 'Qt';
@@ -15491,6 +15579,7 @@ sub get_wm {
if (!$b_wmctrl) {
get_wm_main();
}
+ # note, some wm, like cinnamon muffin, do not appear in ps aux, but do in wmctrl
if ( (!$desktop[5] || $b_wmctrl) && (my $program = main::check_program('wmctrl'))){
get_wm_wmctrl($program);
}
@@ -15502,10 +15591,10 @@ sub get_wm_main {
# xprop is set only if not kde/gnome/cinnamon/mate/budgie/lx..
if ($b_xprop){
#KWIN_RUNNING
- $wms = 'blackbox|compiz|kwin_wayland|kwin_x11|kwin|marco|muffin|';
- $wms .= 'openbox|herbstluftwm|twin|wm2|windowmaker|i3';
+ $wms = 'amiwm|blackbox|bspwm|compiz|kwin_wayland|kwin_x11|kwin|marco|';
+ $wms .= 'motif|muffin|openbox|herbstluftwm|twin|wm2|windowmaker|i3';
foreach (@xprop){
- if (/\b($wms)\b/){
+ if (/($wms)/){
$working = $1;
$working = 'wmaker' if $working eq 'windowmaker';
last;
@@ -15515,10 +15604,11 @@ sub get_wm_main {
if (!$desktop[5]){
main::set_ps_gui() if ! $b_ps_gui;
# order matters, see above logic
- $wms = '9wm|afterstep|amiwm|awesome|budgie-wm|compiz|fluxbox|blackbox|dwm|';
- $wms .= 'flwm|fvwm-crystal|fvwm2|fvwm|gala|gnome-shell|i3|jwm|';
+ $wms = '9wm|afterstep|amiwm|awesome|bspwm|budgie-wm|compiz|fluxbox|blackbox|';
+ $wms .= 'deepin-wm|dwm|flwm|fvwm-crystal|fvwm2|fvwm|gala|gnome-shell|i3|jwm|';
$wms .= 'twin|kwin_wayland|kwin_x11|kwin|matchbox-window-manager|marco|';
- $wms .= 'muffin|mutter|metacity|mwm|notion|openbox|ratpoison|sawfish|scrotwm|spectrwm|';
+ $wms .= 'muffin|deepin-mutter|mutter|deepin-metacity|metacity|mwm|';
+ $wms .= 'notion|openbox|ratpoison|sawfish|scrotwm|spectrwm|';
$wms .= 'twm|windowlab|WindowMaker|wm2|wmii2|wmii|xfwm4|xfwm5|xmonad';
foreach (@ps_gui){
if (/^($wms)$/){
@@ -15546,6 +15636,7 @@ sub get_wm_wmctrl {
$desktop[5] = main::trimmer($desktop[5]);
# change Metacity (Marco) to marco
if ($desktop[5] =~ /marco/i) {$desktop[5] = 'marco'}
+ elsif ($desktop[5] =~ /muffin/i) {$desktop[5] = 'muffin'}
elsif (lc($desktop[5]) eq 'gnome shell') {$desktop[5] = 'gnome-shell'}
elsif ($desktop_session eq 'trinity' && lc($desktop[5]) eq 'kwin') {$desktop[5] = 'Twin'}
get_wm_version('wmctrl',$desktop[5]);
@@ -15575,79 +15666,20 @@ sub get_wm_version {
}
eval $end if $b_log;
}
-
-sub set_gtk_data {
- eval $start if $b_log;
- my ($version,$program,@data);
- # this is a hack, and has to be changed with every toolkit version change, and
- # only dev systems # have this installed, but it's a cross distro command try it.
- if ($program = main::check_program('pkg-config')){
- @data = main::grabber("$program --modversion gtk+-4.0 2>/dev/null");
- $version = main::awk(\@data,'\S');
- # note: opensuse gets null output here, we need the command to get version and output sample
- if ( !$version ){
- @data = main::grabber("$program --modversion gtk+-3.0 2>/dev/null");
- $version = main::awk(\@data,'\S');
- }
- if ( !$version ){
- @data = main::grabber("$program --modversion gtk+-2.0 2>/dev/null");
- $version = main::awk(\@data,'\S');
- }
- }
- # now let's go to more specific version tests, this will never cover everything and that's fine.
- if (!$version){
- # we'll try some known package managers next. dpkg will handle a lot of distros
- # this is the most likely order as of: 2014-01-13. Not going to try to support all
- # package managers too much work, just the very biggest ones.
- if ($program = main::check_program('dpkg')){
- @data = main::grabber("$program -s libgtk-3-0 2>/dev/null");
- $version = main::awk(\@data,'^\s*Version',2,'\s+');
- # just guessing on gkt 4 package name
- if (!$version){
- @data = main::grabber("$program -s libgtk-4-0 2>/dev/null");
- $version = main::awk(\@data,'^\s*Version',2,'\s+');
- }
- if (!$version){
- @data = main::grabber("$program -s libgtk2.0-0 2>/dev/null");
- $version = main::awk(\@data,'^\s*Version',2,'\s+');
- }
- }
- elsif ($program = main::check_program('pacman')){
- @data = main::grabber("$program -Qi gtk3 2>/dev/null");
- $version = main::awk(\@data,'^\s*Version',2,'\s*:\s*');
- # just guessing on gkt 4 package name
- if (!$version){
- @data = main::grabber("$program -Qi gtk4 2>/dev/null");
- $version = main::awk(\@data,'^\s*Version',2,'\s*:\s*');
- }
- if (!$version){
- @data = main::grabber("$program -Qi gtk2 2>/dev/null");
- $version = main::awk(\@data,'^\s*Version',2,'\s*:\s*');
- }
- }
- elsif ($program = main::check_program('rpm')){
- @data = main::grabber("$program -qi libgtk-3-0 2>/dev/null");
- $version = main::awk(\@data,'^\s*Version',2,'\s*:\s*');
- # just guessing on gkt 4 package name
- if (!$version){
- @data = main::grabber("$program -qi libgtk-4-0 2>/dev/null");
- $version = main::awk(\@data,'^\s*Version',2,'\s*:\s*');
- }
- if (!$version){
- @data = main::grabber("$program -qi libgtk-3-0 2>/dev/null");
- $version = main::awk(\@data,'^\s*Version',2,'\s*:\s*');
- }
- }
- }
- $desktop[2] = 'Gtk';
- eval $end if $b_log;
-}
+# see: inxi-fragments.txt for legacy code
+# sub set_gtk_data {
+# }
sub set_info_data {
eval $start if $b_log;
my (@data,@info,$item);
- my $pattern = 'gnome-panel|kicker|lxpanel|lxqt-panel|matchbox-panel|';
- $pattern .= 'mate-panel|plasma-desktop|plasma-netbook|razor-panel|razorqt-panel|';
- $pattern .= 'wingpanel|xfce4-panel|xfce5-panel';
+ my $pattern = 'awn|bar|bmpanel|bmpanel2|budgie-panel|cairo-dock|';
+ $pattern .= 'dde-dock|dmenu|dockbarx|docky|dzen|dzen2|';
+ $pattern .= 'fbpanel|fspanel|gnome-panel|hpanel|i3bar|icewmtray|kicker|';
+ $pattern .= 'lemonbar|ltpanel|lxpanel|lxqt-panel|matchbox-panel|';
+ $pattern .= 'mate-panel|plank|plasma-desktop|plasma-netbook|polybar|pypanel|';
+ $pattern .= 'razor-panel|razorqt-panel|tint2|';
+ $pattern .= 'vala-panel|wbar|wharf|wingpanel|witray|';
+ $pattern .= 'xfce4-panel|xfce5-panel|xmobar|yabar';
if (@data = grep {/^($pattern)$/} @ps_gui ) {
# only one entry per type, can be multiple
foreach $item (@data){
@@ -15658,7 +15690,7 @@ sub set_info_data {
}
}
}
- $desktop[4] = join (',', @info) if @info;
+ $desktop[4] = join (', ', @info) if @info;
eval $end if $b_log;
}
@@ -15669,9 +15701,9 @@ sub set_xprop {
if (@xprop){
# add wm / de as required, but only add what is really tested for above
# XFDESKTOP_IMAGE_FILE; XFCE_DESKTOP
- my $pattern = '^amiwm|blackbox_pid|compiz|enlightenment|^_gnome|herbstluftwm|';
- $pattern .= '^kwin_|^i3_|icewm|_marco|^_motif|_muffin|openbox_pid|';
- $pattern .= '^_?windowmaker|^_wm2|^(xfdesktop|xfce)';
+ my $pattern = '^amiwm|blackbox_pid|bspwm|compiz|enlightenment|^_gnome|';
+ $pattern .= 'herbstluftwm|^kwin_|^i3_|icewm|_marco|^_motif|_muffin|';
+ $pattern .= 'openbox_pid|^_?windowmaker|^_wm2|^(xfdesktop|xfce)';
# let's only do these searches once
@xprop = grep {/^\S/ && /($pattern)/i} @xprop;
$_ = lc for @xprop;
@@ -15693,9 +15725,8 @@ sub get_display_manager {
my @dms = qw(entranced.pid gdm.pid gdm3.pid kdm.pid ldm.pid
lightdm.pid lxdm.pid mdm.pid nodm.pid pcdm.pid sddm.pid slim.lock
tint2.pid wdm.pid xdm.pid xenodm.pid);
- # this is the only one I know of so far that has --version
- # lightdm outputs to stderr, so it has to be redirected
- my @dms_version = qw(lightdm);
+ # these are the only one I know of so far that have version info
+ my @dms_version = qw(gdm gdm3 lightdm slim);
$b_run = 1 if -d "/run";
# in most linux, /var/run is a sym link to /run, so no need to check it twice
if ( -d "/var/run" ){
@@ -15717,8 +15748,8 @@ sub get_display_manager {
( $b_vrunrc && ( -f "/var/run/rc.d/$working" || -d "/var/run/rc.d/$id" ) ) ) &&
! grep {/$working/} @found ){
if ($extra > 2 && awk( \@dms_version, $working) && (my $path = main::check_program($working)) ){
- @data = main::grabber("$path --version 2>&1");
- $temp = awk(\@data,'\S',2,'\s+');
+ @data = main::program_values($working);
+ $temp = main::program_version($path,$data[0],$data[1],$data[2],$data[5],$data[6]);
$working .= ' ' . $temp if $temp;
}
push @found, $working;
@@ -15823,9 +15854,8 @@ sub get_linux_distro {
# Note that antergos changed this around # 2018-05, and now lists
# antergos in os-release, sigh... We want these distros to use os-release
# if it contains their names. Last check below
- if ( @osr && (grep {/manjaro|antergos|chakra|pclinuxos/i} @osr ) ){
+ if ( @osr && ( grep {/(manjaro|antergos|chakra|pclinuxos|zorin)/i} @osr ) ){
$distro_file = $os_release;
- #$system_base = 'Arch Linux';
}
$distro_id = 'armbian' if grep {/armbian/} @distro_files;
main::log_data('dump','@distro_files',\@distro_files) if $b_log;
@@ -15962,6 +15992,7 @@ sub get_linux_distro {
my $base_manual = 'kali'; # synthesize, no direct data available
my $base_osr = 'aptosid|grml|siduction'; # osr base, distro id in list of distro files
my $base_osr_issue = 'grml|linux lite'; # osr base, distro id in issue
+ my $base_osr_ubuntu = 'mint|zorin'; # osr has distro name but has ubuntu ID_LIKE/UBUNTU_CODENAME
my $base_upstream_lsb = '/etc/upstream-release/lsb-release';
my $base_upstream_osr = '/etc/upstream-release/os-release';
# first: try, some distros have upstream-release, elementary, new mint
@@ -15989,7 +16020,7 @@ sub get_linux_distro {
elsif ( @distro_files && (grep {/($base_default)/} @distro_files) ){
$base_type = 'default';
}
- elsif ($distro_id && $distro_id =~ /(mint)/){
+ elsif ( grep {/($base_osr_ubuntu)/} @osr ){
$base_type = 'ubuntu';
}
elsif ( ( ($distro_id && $distro_id =~ /($base_osr_issue)/ ) ||
@@ -16088,7 +16119,7 @@ sub get_os_release {
elsif ($working[0] eq 'VERSION_ID' && $working[1]){
$version_id = $working[1];
}
- # for mint system base
+ # for mint/zorin, other ubuntu base system base
if ($base_type ){
if ($working[0] eq 'ID_LIKE' && $working[1]){
if ($base_type eq 'ubuntu'){
@@ -16173,6 +16204,7 @@ sub ubuntu_id {
return $id;
}
}
+
sub get_gcc_data {
eval $start if $b_log;
my ($gcc,@data,@gccs,@temp);
@@ -16202,6 +16234,7 @@ sub get_gcc_data {
eval $end if $b_log;
return @gccs;
}
+
# rasberry pi only
sub get_gpu_ram_arm {
eval $start if $b_log;
@@ -16217,6 +16250,7 @@ sub get_gpu_ram_arm {
eval $end if $b_log;
return $gpu_ram;
}
+
# standard systems
sub get_gpu_ram {
eval $start if $b_log;
@@ -16537,9 +16571,11 @@ sub get_pci_vendor {
my ($device, $subsystem) = @_;
return if !$subsystem;
my ($vendor,$sep) = ('','');
+ # get rid of any [({ type characters that will make regex fail
+ $subsystem = regex_cleaner($subsystem);
my @data = split /\s+/, $subsystem;
foreach (@data){
- if ($device !~ !/\b$_\b/){
+ if ($device !~ /\b$_\b/){
$vendor .= $sep . $_;
$sep = ' ';
}
@@ -16900,7 +16936,6 @@ sub get_usb_path {
return $path
}
-
#### -------------------------------------------------------------------
#### SET DATA VALUES
#### -------------------------------------------------------------------
@@ -16965,6 +17000,7 @@ sub set_dmesg_boot_data {
# got here, we're good.
sub set_dmi_data {
eval $start if $b_log;
+ $_[0] = 1; # check boolean passed by reference
if ($alerts{'dmidecode'}{'action'} eq 'use' ){
set_dmidecode_data();
}
@@ -17201,6 +17237,7 @@ sub set_ifconfig {
sub set_pci_data {
eval $start if $b_log;
+ $_[0] = 1; # check boolean passed by reference
if ( $b_pci ){
if (!$bsd_type){
if ($alerts{'lspci'}{'action'} eq 'use' ){
@@ -17424,6 +17461,8 @@ sub set_pciconf_data {
# /sys/devices/soc.0/1c30000.eth/uevent
## 8
# /sys/devices/wlan.26/uevent [from pine64]
+## 9
+# sys/devices/platform/audio/uevent:["DRIVER=bcm2835_AUD0", "OF_NAME=audio"
sub set_soc_data {
eval $start if $b_log;
my ($content,@files,@temp2,@temp3,@working);
@@ -17431,6 +17470,8 @@ sub set_soc_data {
@files = globber('/sys/devices/platform/soc*/*/uevent');
@temp2 = globber('/sys/devices/platform/soc*/*/*/uevent');
@files = (@files,@temp2) if @temp2;
+ @temp2 = globber('/sys/devices/platform/*/uevent');
+ @files = (@files,@temp2) if @temp2;
}
if (globber('/sys/devices/soc*')){
@temp2 = globber('/sys/devices/soc*/*/uevent');
@@ -17441,8 +17482,8 @@ sub set_soc_data {
@temp2 = globber('/sys/devices/*/uevent'); # see case 8
@files = (@files,@temp2) if @temp2;
@temp2 = undef;
- # not sure why, but even as root/sudo, /subsystem/uevent is unreadable with -r test true
- @files = grep {!/subsystem/} @files if @files;
+ # not sure why, but even as root/sudo, /subsystem|driver/uevent are unreadable with -r test true
+ @files = grep {!/\/(subsystem|driver)\//} @files if @files;
foreach my $file (@files){
next if -z $file;
my ($busid,$busid_nu,$chip_id,$device,$driver,$modules,$port,$rev,
@@ -17472,15 +17513,15 @@ sub set_soc_data {
# it's worthless, we can't use it
next if ! defined $type;
$driver = '' if ! defined $driver;
- $busid = (defined $temp && $temp =~ /^[0-9]+$/) ? $temp: 0;
+ $busid = (defined $temp && is_int($temp)) ? $temp: 0;
$busid_nu = 0;
$type_id = '';
$port = '';
$rev = '';
$modules = '';
# note: use these for main Card match for -AGN
- $b_soc_audio = 1 if $type =~ /^(audio|daudio|hdmi|multimedia)$/;
- $b_soc_gfx = 1 if $type =~ /^(vga|disp|display|3d|fb|gpu|hdmi)$/;
+ $b_soc_audio = 1 if $type =~ /^(audio|daudio|hdmi|hdmi-audio|multimedia)$/;
+ $b_soc_gfx = 1 if $type =~ /^(vga|disp|display|display-port-controller|3d|fb|gpu|hdmi|mali)$/;
$b_soc_net = 1 if $type =~ /^(eth|ethernet|ethernet-phy|network|wifi|wlan)$/;
@temp3 = ($type,$type_id,$busid,$busid_nu,$device,$vendor_id,$chip_id,$rev,$port,$driver,$modules);
@pci = (@pci,[@temp3]);
@@ -17516,30 +17557,35 @@ sub set_ps_gui {
eval $start if $b_log;
$b_ps_gui = 1;
my ($working,@match,@temp);
- # desktops
+ # desktops / wm
if ($show{'system'}){
- @temp=qw(razor-desktop razor-session lxsession lxqt-session tdelauncher tdeinit_phase1);
+ @temp=qw(razor-desktop razor-session lxsession lxqt-session
+ tdelauncher tdeinit_phase1);
@match = (@match,@temp);
- @temp=qw(afterstep awesome blackbox 3dwm dwm fluxbox flwm
- fvwm-crystal fvwm2 fvwm i3 jwm matchbox-panel openbox sawfish
- scrotwm spectrwm twm WindowMaker wm2 wmii2 wmii);
+ @temp=qw(3dwm 9wm afterstep amiwm afterstep awesome
+ blackbox bspwm dwm fluxbox flwm fvwm.*-crystal fvwm2 fvwm
+ i3 jwm matchbox-window-manager mwm openbox notion pekwm ratpoison sawfish
+ scrotwm spectrwm twm windowlab WindowMaker wm2 wmii2 wmii xmonad);
@match = (@match,@temp);
}
# wm:
if ($show{'system'} && $extra > 1){
- @temp=qw(9wm 3dwm afterstep amiwm awesome blackbox budgie-wm compiz
- dwm fluxbox flwm fvwm-crystal fvwm2 fvwm gala gnome-shell i3 jwm
- twin kwin_wayland kwin_x11 kwin marco matchbox-window-manager metacity
- metisse mir muffin mutter mwm notion openbox ratpoison sawfish
- scrotwm spectrwm twm windowlab WindowMaker wm2 wmii2 wmii xfwm4
- xfwm5 xmonad);
+ @temp=qw(budgie-wm compiz deepin-wm gala gnome-shell
+ twin kwin_wayland kwin_x11 kwin marco
+ deepin-metacity metacity metisse mir muffin deepin-mutter mutter
+ xfwm4 xfwm5 xmonad);
@match = (@match,@temp);
}
# info:
if ($show{'system'} && $extra > 2){
- @temp=qw(budgie-panel gnome-panel kicker lxpanel lxqt-panel
- matchbox-panel mate-panel plasma-desktop plasma-netbook razor-panel
- razorqt-panel wingpanel xfce4-panel xfce5-panel);
+ @temp=qw(awn bar bmpanel bmpanel2 budgie-panel cairo-dock
+ dde-dock dmenu dockbarx docky dzen dzen2
+ fbpanel fspanel gnome-panel hpanel
+ i3bar icewmtray kicker lemonbar ltpanel lxpanel lxqt-panel
+ matchbox-panel mate-panel
+ perlpanel plank plasma-desktop plasma-netbook polybar pypanel
+ razor-panel razorqt-panel tint2 vala-panel wbar wharf wingpanel witray
+ xfce4-panel xfce5-panel xmobar yabar);
@match = (@match,@temp);
}
# compositors (for wayland these are also the server, note
@@ -17552,8 +17598,8 @@ sub set_ps_gui {
@match = uniq(@match);
my $matches = join '|', @match;
foreach (@ps_cmd){
- if (/^[\S]*\b($matches)(\s|$)/){
- $working = $1;
+ if (/^(|[\S]*\/)($matches)(\/|\s|$)/){
+ $working = $2;
push @ps_gui, $working; # deal with duplicates with uniq
}
}
@@ -17608,6 +17654,7 @@ sub set_sysctl_data {
# http://www.usb.org/developers/defined_class
sub set_usb_data {
eval $start if $b_log;
+ $b_usb_check = 1;
if ($alerts{'lsusb'}{'action'} eq 'use' ){
#$usb_level = 2;
# NOTE: we can't get reliable usb network device with short
@@ -17708,7 +17755,7 @@ sub set_lsusb_data_long {
#elsif (/^Bus\s/){
#if (/^Bus\s([0-9]+)\sDevice\s([0-9]+):\sID\s(([0-9a-f]{4}):([0-9a-f]{4})).*/){
$j = scalar @usb;
- $bus_id = int($1);
+ $bus_id = int($1); # trim off leading 0's
$device_id = int($2);
$id = $3;
$b_skip = 0;
@@ -17851,58 +17898,50 @@ sub generate_lines {
assign_data(%row);
}
if ( $show{'machine'} ){
- if ($b_dmi && !$b_dmi_check ){
- set_dmi_data() ;
- $b_dmi_check = 1;
- }
+ set_dmi_data($b_dmi_check) if $b_dmi && !$b_dmi_check;
set_dmesg_boot_data() if ($bsd_type && !$b_dmesg_boot_check);
%row = line_handler('Machine','machine');
assign_data(%row);
}
if ( $show{'battery'} ){
- set_dmi_data() if $b_dmi && !$b_dmi_check;
- $b_dmi_check = 1;
+ set_dmi_data($b_dmi_check) if $b_dmi && !$b_dmi_check;
%row = line_handler('Battery','battery');
if (%row || $show{'battery-forced'}){
assign_data(%row);
}
}
if ( $show{'ram'} ){
- set_dmi_data() if $b_dmi && !$b_dmi_check;
- $b_dmi_check = 1;
+ set_dmi_data($b_dmi_check) if $b_dmi && !$b_dmi_check;
%row = line_handler('Memory','ram');
assign_data(%row);
}
if ( $show{'slot'} ){
- set_dmi_data() if $b_dmi && !$b_dmi_check;
- $b_dmi_check = 1;
+ set_dmi_data($b_dmi_check) if $b_dmi && !$b_dmi_check;
%row = line_handler('PCI Slots','slot');
assign_data(%row);
}
if ( $show{'cpu'} || $show{'cpu-basic'} ){
+ set_pci_data($b_pci_check) if $b_arm && !$b_pci_check;
set_dmesg_boot_data() if ($bsd_type && !$b_dmesg_boot_check);
my $arg = ($show{'cpu-basic'}) ? 'basic' : 'full' ;
%row = line_handler('CPU','cpu',$arg);
assign_data(%row);
}
if ( $show{'graphic'} ){
- set_pci_data() if !$b_pci_check;
- $b_pci_check = 1;
+ set_pci_data($b_pci_check) if !$b_pci_check;
%row = line_handler('Graphics','graphic');
assign_data(%row);
}
if ( $show{'audio'} ){
- set_pci_data() if !$b_pci_check;
+ set_pci_data($b_pci_check) if !$b_pci_check;
$b_pci_check = 1;
%row = line_handler('Audio','audio');
assign_data(%row);
}
if ( $show{'network'} ){
set_usb_data() if !$b_usb_check;
- set_pci_data() if !$b_pci_check;
+ set_pci_data($b_pci_check) if !$b_pci_check;
set_ip_data() if ($show{'ip'} || ($bsd_type && $show{'network-advanced'}));
- $b_pci_check = 1;
- $b_usb_check = 1;
%row = line_handler('Network','network');
assign_data(%row);
}
@@ -17928,7 +17967,6 @@ sub generate_lines {
set_usb_data() if !$b_usb_check;
%row = line_handler('USB','usb');
assign_data(%row);
- $b_usb_check = 1;
}
if ( $show{'sensor'} ){
%row = line_handler('Sensors','sensor');
@@ -18039,14 +18077,15 @@ sub generate_short_data {
my (@temp,$size_holder,$used_holder);
if (@disk){
$size = $disk[0]{'size'};
- if ($disk[0]{'size'} && $disk[0]{'size'} =~ /^[0-9\.]+$/){
+ # must be > 0
+ if ($disk[0]{'size'} && main::is_numeric($disk[0]{'size'}) ){
$size_holder = $disk[0]{'size'};
@temp = get_size($size);
$size = $temp[0];
$size_type = " $temp[1]";
}
$used = $disk[0]{'used'};
- if (defined $disk[0]{'used'} && $disk[0]{'used'} =~ /^[0-9\.]+$/){
+ if (main::is_numeric($disk[0]{'used'}) ){
$used_holder = $disk[0]{'used'};
@temp = get_size($used);
$used = $temp[0];
@@ -18258,7 +18297,7 @@ sub generate_system_data {
}
# don't print the desktop if it's a wm and the same
if ($extra > 1 && $desktop_data[5] &&
- (!$desktop_data[0] || $desktop_data[5] =~ /^(gnome[\s\-_]shell|budgie-wm)$/i ||
+ (!$desktop_data[0] || $desktop_data[5] =~ /^(deepin-.*|gnome[\s\-_]shell|budgie-.*)$/i ||
index(lc($desktop_data[5]),lc($desktop_data[0])) == -1 )){
$wm = $desktop_data[5];
$wm .= ' ' . $desktop_data[6] if $extra > 2 && $desktop_data[6];
diff --git a/inxi.1 b/inxi.1
index 5360446..da0c41a 100644
--- a/inxi.1
+++ b/inxi.1
@@ -1,4 +1,4 @@
-.TH INXI 1 "2018\-07\-16" inxi "inxi manual"
+.TH INXI 1 "2018\-07\-30" inxi "inxi manual"
.SH NAME
inxi \- Command line system information script for console and IRC
.SH SYNOPSIS
@@ -273,7 +273,7 @@ Show full Partition information (\fB\-P\fR plus all other detected mounted parti
.TP
.B \-P\fR,\fB \-\-partitions\fR
Show basic Partition information.
-Shows, if detected: \fB/ /boot /home /opt /tmp /usr /var /var/tmp /var/log\fR.
+Shows, if detected: \fB/ /boot /home /opt /tmp /usr /usr/home /var /var/tmp /var/log\fR.
Use \fB\-p\fR to see all mounted partitions.
.TP
.B \-r\fR,\fB \-\-repos\fR
@@ -766,12 +766,14 @@ data available.
\fBvendor:\fR item, which shows specific vendor [product] information.
.TP
.B \-xxx \-S\fR
-\- Adds, if run in X and present, shell/panel type (\fBinfo\fR).
+\- Adds, if run in X and present, bar/panel type (\fBinfo\fR).
If none, shows nothing. Supports some current desktop extras like gnome\-panel,
-lxpanel, xfce4\-panel, lxqt\-panel, and others (Mint feature request).
+lxpanel, xfce4\-panel, lxqt\-panel, and others.
\- Adds (if present), window manager (\fBwm\fR) version number.
+\- Adds (if present), display manager (\fBdm\fR) version number.
+
.TP
.B \-xxx \-w\fR,\fB \-W\fR
\- Adds location (city state country), altitude, weather observation time.
@@ -974,7 +976,7 @@ script output.
To trigger inxi output in your IRC client, pick the appropriate method from the
list below:
.TP
-.B XChat, Irssi
+.B Hexchat, XChat, Irssi
\fR(and many other IRC clients)
.B /exec \-o inxi \fR[\fBoptions\fR]
If you don't include the \fB\-o\fR, only you will see the output on your local
diff --git a/inxi.changelog b/inxi.changelog
index 020173c..74d435d 100644
--- a/inxi.changelog
+++ b/inxi.changelog
@@ -1,4 +1,142 @@
=====================================================================================
+Version: 3.0.20
+Patch Version: 00
+Script Date: 2018-07-30
+-----------------------------------
+Changes:
+-----------------------------------
+New version, new man. ARM enhancements and updates, -S data ongoing enhancements.
+
+Fixes:
+1. Added support for new ARM SOC types, including chromebook ARM. Note that so far I
+have been unable to find a way to detect MMC networking, at least in a meaningful
+way. I know where the data is, but I can't figure out how to reasonably integrate it
+into the main ARM soc/device generator logic because it's fundamentally different
+from most platform or devicetree data.
+2. Added alternate battery tests, this should cover a wide range of alternate
+battery IDs, while still preserving the distinction between system power batteries,
+and device batteries. The detection is now far more dynamic, and can handle
+unknown syntax for battery ID, while not losing the ability to correctly identify
+device batteries (like mice, keyboards, etc).
+3. Trying a somewhat unreliable hack to get cpu variant for arm devices where the
+current method fails. this may be removed if it causes false ID in the future.
+4. Excluded all /driver/ paths from ARM SOC @pci generation, those give read errors
+even as root.
+5. Fixed a few defective wm version detections.
+
+Enhancements:
+The -S line continues to see many improvements.
+1. Greatly expanded the set of info: items, now it covers all the toolbars,
+panels, and docks that I could find, plus a few things like icewmtray, where the
+wm has a built in panel. While there are probably more bar/panel/dock tools out
+there, and more will get added if or when they are encountered, now info: shows
+far more variants than ever before, and covers the range of options simpler wm
+users have for bars, trays, and panels. If I missed one that is detectable, by
+all means show how to detect it!
+2. Fine tuned and added a few more window managers, and added version for some that
+were not showing versions.
+3. Added 3 more dm version handlers, slim, gdm, gdm3, and refactored that code to
+use the same program_values/program_version logic that the other tools use.
+4. A few more obscure and usb stick vendor IDs added.
+
+-----------------------------------
+-- Harald Hope - Mon, 30 Jul 2018 18:06:11 -0700
+
+=====================================================================================
+Version: 3.0.19
+Patch Version: 00
+Script Date: 2018-07-23
+-----------------------------------
+Changes:
+-----------------------------------
+New version, new man. Fixes, glitches, and stitches!
+
+Fixed some subtle and not subtle issues that I've noticed recently.
+
+Bugs:
+1. The color scheme selector failed to remove the global value when a non global
+setting was used. This led to global values never getting removed, even though
+the text output said it would be, which is confusing, obviously, and always
+overriding the color selected. Thanks CentOS for helping find that one.
+
+Fixes:
+1. Fixed possible corrupted user inxi.conf values. Now skips null values, and
+fully validates as integer integer values.
+2. Fixed fvwm-crystal detections, integrated it into new refactored desktop logic.
+3. For systems without glxinfo or running inxi out of gui/desktop, Xorg was in many
+cases failing to show version, which made it not show anything for server: except
+N/A. This is caused by a relatively recent change in behaviors in xorg, where you
+have to run it directly from it's true path, which is something like /usr/lib/xorg
+or /usr/lib/server-xorg at which point the error:
+/usr/lib/xorg-server/Xorg.wrap: Only console users are allowed to run the X server
+Figuring this out was tricky, and who the heck knows why Xorg -version would even
+return such a silly error in the first place, but there you have it. Next time
+you wonder why inxi is so long, this is why, endless churn in basic and complex
+things! The fix is injecting the optional xorg paths into @paths right before,
+and removing them right after, which avoids adding clutter to the @paths.
+4. A ZFS fix, I'd noticed this one a while back, but after looking at the zfs
+Ubuntu tutorial page, I realized that this is the norm now, which is building zfs
+with /dev/sda (no partitions). This lead to failing to detect the zfs components,
+and reporting a bunch of partitions as unmounted which were part of that /dev/sdb
+type component array. By allowing /dev/sd[a-z] I fixed both errors at the same time,
+but I don't know if this syntax extends to say, nvme zfs as well. Note that when
+you build zfs arrays with say, /dev/sdb /dev/sdc you'll see two partitions per
+disk, /dev/sdx1 which is the main data, and /dev/sdx2, which is a tiny 8mB partition,
+no idea what it's for.
+5. Fixed missing konversation and hexchat version numbers in -I, finally found
+what was going on there. Note that hexchat --version used to pop up a gui, but
+I guess he finally fixed that, I am hoping.
+6. Fixed some gentoo repo detections, but also found more variants. Not sure what
+exactly is going on with repos there, will wait for gentoo user issue reports to
+really lock those down.
+7. BSD fixes, turns out FreeBSD uses that same map ... syntax in df -kT as OSX...
+Also made sure to load sysctl data for -S row, I'd forgotten about the compiler
+test there which needs that data.
+8. Fixed herbstluftwm version detection, turns out it's another one of those that
+passes the entire path to the version program, so it shows: /sbin/herbsuftwm 0.22.0
+which broke the regex, easy fix.
+9. Completed refactoring of DesktopData, now it's all data array driven for most
+wm, desktops, etc, which makes adding/removing one very easy. All core data is now
+in program_values to allow for automated detections.
+
+Enhancements:
+1. With fix 1, added check_int and check_number utilities, these validate that inxi
+internal numeric or integer values actually are what they are supposed to be. This
+uses a neat Perl trick that makse the checks super fast and super accurate. Moved
+all internal int/numeric test regex to use these.
+2. Added file based version number detection, that was done for Deepin, which uses
+/etc/deepin-version for its version number, but it can be used for anything.
+3. Added Deepin and deepin window managers, Lumina, added bspwm wm, fixed muffin
+detections. Note that lumina has a weird behavior where when run outside of pinxi,
+it outputs to stdout, but inside of pinxi, to stderr, who the heck knows how that
+happens!
+4. Added zorin to supported base: distros.
+5. Even more disk vendors added! The list of no-name off brand chinese ssd vendors
+appears to be endless! Added some more specific ids to capture unique strings
+that can be linked to a vendor.
+6. Added /usr/home to default -P paths, that's used instead of /home in the real
+world, so why not show it?
+7. Because qt detection is possible, I've extended qt toolkit detection, but it's
+also not super accurate, but it's far better than gtk tk was, so I'm leaving
+that in. I also extended it to more wm/desktops since more are using qt now.
+Note: budgie 11 is going to be qt, but there's no way to distinguish between 11 and
+gtk 10 without doing a bunch of hacks so I'm leaving that alone.
+8. Found a possible distro id source, added /etc/calamares detections to debugger,
+I'll see if that shows some consistent patterns before I implement a last fallback
+test for distro IDs. It may work.
+
+Removed:
+1. Giving up on fake/slow/inaccurate GTK toolkit detections, removed the entire
+codeblock and stored in docs/inxi-fragments.txt, but I'm not going to do package
+manager type version tests anymore, if we can't get the data directly from a program
+or file, it's not going to happen, plus the gtk installed on the system means nothing
+in relation to the gtk version used to build the desktop.
+
+
+-----------------------------------
+-- Harald Hope - Mon, 23 Jul 2018 12:57:38 -0700
+
+=====================================================================================
Version: 3.0.18
Patch Version: 00
Script Date: 2018-07-16