cleaned up debugger 66 values to be more clear.

This commit is contained in:
Harald Hope 2024-02-04 11:17:57 -08:00
parent 61f3000fd7
commit c77dff5887

24
pinxi
View file

@ -50,8 +50,8 @@ use POSIX qw(ceil uname strftime ttyname);
## INXI INFO ##
my $self_name='pinxi';
my $self_version='3.3.32';
my $self_date='2024-02-02';
my $self_patch='06';
my $self_date='2024-02-04';
my $self_patch='07';
## END INXI INFO ##
my ($b_pledge,@pledges);
@ -73,10 +73,9 @@ if (eval {require OpenBSD::Pledge}){
my ($fake_data_dir,$self_path,$user_config_dir,$user_config_file,$user_data_dir);
## Hashes
my (%alerts,%build_prop,%client,%colors,,%cpuinfo_machine,%comps,
%disks_bsd,%dboot,%devices,%dl,%dmmapper,%force,%loaded,%mapper,
%program_values,%ps_data,%risc,%service_tool,%show,%sysctl,%system_files,
%usb,%windows);
my (%alerts,%build_prop,%client,%colors,,%cpuinfo_machine,%comps,%disks_bsd,
%dboot,%devices,%dl,%dmmapper,%force,%loaded,%mapper,%program_values,%ps_data,
%risc,%service_tool,%show,%sysctl,%system_files,%usb,%windows);
## System Arrays
my (@cpuinfo,@dmi,@ifs,@ifs_bsd,@paths,@ps_aux,@ps_cmd,
@ -4364,8 +4363,8 @@ sub set_version_data {
## OptionsHandler
{
package OptionsHandler;
# note: had %trigger local but tripped odd perl 5.008 failures unless global
# so moved to %use and %show globals.
# Note: used %trigger here, but perl 5.008 had issues, so mmoved to global.
# Careful with hash globals in first Perl 5.0080.
my ($self_download,$download_id);
sub get {
@ -5139,7 +5138,6 @@ sub get {
main::error_handler('unknown-option', "$opt", "");}
); # or error_handler('unknown-option', "@ARGV", '');
# run all these after so that we can change widths, downloaders, etc
# print Data::Dumper::Dumper \%trigger;
post_process();
eval $end if $b_log;
}
@ -31440,7 +31438,7 @@ sub get_distro_bsd {
}
if ($distro->{'dbg'}){
dbg_distro_files('BSD',$distro->{'files'});
main::feature_debugger('distro',$distro);
main::feature_debugger('name: $distro: pre-base [bsd]',$distro);
}
system_base_bsd() if $extra > 0;
eval $end if $b_log;
@ -31463,7 +31461,7 @@ sub system_base_bsd {
$distro->{'base'} = "$uname[0] $uname[2]";
push(@{$distro->{'method-base'}},'uname 0 + 2');
}
main::feature_debugger('System base $distro [bsd]',$distro) if $distro->{'dbg'};
main::feature_debugger('system-base: $distro [bsd]',$distro) if $distro->{'dbg'};
eval $end if $b_log;
}
@ -31718,7 +31716,7 @@ sub get_distro_linux {
push(@{$distro->{'method'}},'use: distro file name');
}
}
main::feature_debugger('$distro: pre base [linux]',$distro) if $distro->{'dbg'};
main::feature_debugger('name: $distro: pre-base [linux]',$distro) if $distro->{'dbg'};
system_base_linux() if $extra > 0;
# Some last customized changes, double check if possible to verify still valid
if ($distro->{'name'}){
@ -31770,7 +31768,7 @@ sub get_distro_linux {
if ($extra > 0 && $distro->{'name'} && $distro->{'base'}){
check_base();
}
main::feature_debugger('$distro: final [linux]',$distro) if $distro->{'dbg'};
main::feature_debugger('name: $distro: final [linux]',$distro) if $distro->{'dbg'};
eval $end if $b_log;
}