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

cleanups

Browse source
This commit is contained in:
Harald Hope 2018-05-06 20:59:43 -07:00
parent b4339731ba
commit b9d20bc198
1 changed files with 1 additions and 2 deletions

3
inxi
View file

@ -7100,7 +7100,7 @@ sub get {
@data = OpticalData::get(); @data = OpticalData::get();
@rows = (@rows,@data); @rows = (@rows,@data);
} }
($b_hddtemp,$b_nvme,$hddtemp,$nvme) = (undef,undef,undef,undef,undef); ($b_hddtemp,$b_nvme,$hddtemp,$nvme) = (undef,undef,undef,undef);
(@by_id,@by_path) = (undef,undef); (@by_id,@by_path) = (undef,undef);
eval $end if $b_log; eval $end if $b_log;
return @rows; return @rows;
@ -7361,7 +7361,6 @@ sub proc_data_advanced {
foreach my $ref (@scsi){ foreach my $ref (@scsi){
my %row = %$ref; my %row = %$ref;
if ($row{'model'}){ if ($row{'model'}){
# $row{'model'} =~ s/\s/_/g;
$row{'model'} = (split /\s*-\s*/,$row{'model'})[0]; $row{'model'} = (split /\s*-\s*/,$row{'model'})[0];
foreach my $id (@by_id){ foreach my $id (@by_id){
if ($id =~ /$row{'model'}/ && "/dev/$drives[$i]{'id'}" eq Cwd::abs_path($id)){ if ($id =~ /$row{'model'}/ && "/dev/$drives[$i]{'id'}" eq Cwd::abs_path($id)){