dmitriy.kazimirov/inxi
1
0
Fork 0
mirror of https://github.com/smxi/inxi.git synced 2024-11-16 16:21:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

two bugs fixed, first: forgot to set shell generator on inxi short feature,

Browse source 
so shell is blank, second, unhandled new 5.8 kernel /proc/version syntax.
Normally I'd do a new numbered release, but I want these out asap and will
do a full new release later, there are some features under development in
pinxi for sensors that will take some time to handle.
This commit is contained in:
Harald Hope 2020-08-10 19:08:29 -07:00
parent 2ebd05dfb6
commit f16e714dc6
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
inxi
View file

@ -17730,16 +17730,20 @@ sub get_compiler_version_bsd {
sub get_compiler_version_linux { sub get_compiler_version_linux {
eval $start if $b_log; eval $start if $b_log;
my ($file) = @_; my ($file) = @_;
my (@compiler,$type); my (@compiler,$version);
my @data = reader($file); my @data = reader($file);
my $result = $data[0] if @data; my $result = $data[0] if @data;
if ($result){ if ($result){
$result =~ /(gcc|clang).*version\s([\S]+)/;
# $result = $result =~ /\*(gcc|clang)\*eval\*/; # $result = $result =~ /\*(gcc|clang)\*eval\*/;
if ($1){ if ($result =~ /(gcc|clang).*version\s([\S]+)/){
$type = $2; $version = $2;
$type ||= 'N/A'; # we don't really know what linux clang looks like! $version ||= 'N/A'; # we don't really know what linux clang looks like!
@compiler = ($1,$type); @compiler = ($1,$version);
}
elsif ($result =~ /\((gcc|clang)[^\(]*\([^\)]+\)\s+([0-9\.]+)\s.*,\s*GNU/){
$version = $2;
$version ||= 'N/A'; # we don't really know what linux clang looks like!
@compiler = ($1,$version);
} }
} }
log_data('dump','@compiler',\@compiler) if $b_log; log_data('dump','@compiler',\@compiler) if $b_log;
@ -17747,6 +17751,7 @@ sub get_compiler_version_linux {
return @compiler; return @compiler;
} }
## Get DesktopEnvironment ## Get DesktopEnvironment
## returns array: ## returns array:
# 0 - desktop name # 0 - desktop name
@ -21540,6 +21545,7 @@ sub generate_short_data {
eval $start if $b_log; eval $start if $b_log;
my $num = 0; my $num = 0;
my $kernel_os = ($bsd_type) ? 'OS' : 'Kernel'; my $kernel_os = ($bsd_type) ? 'OS' : 'Kernel';
get_shell_data($client{'ppid'}) if $client{'ppid'};
my $client = $client{'name-print'}; my $client = $client{'name-print'};
my $client_shell = ($b_irc) ? 'Client' : 'Shell'; my $client_shell = ($b_irc) ? 'Client' : 'Shell';
if ($client{'version'}){ if ($client{'version'}){