Merge ~sylvain-pineau/plainbox-provider-checkbox:inxi_2021_07_21 into plainbox-provider-checkbox:master

[Sylvain Pineau]

Version refresh of the INXI system information tool

The previous snapshot was from 2018 and was missing some CPU IDs

Tested on AMD64

[Maciej Kisielewski (kissiel)]

+1

review: Approve

diff --git a/bin/inxi_snapshot b/bin/inxi_snapshot
index 5928ca5..6c4d37b 100755
--- a/bin/inxi_snapshot
+++ b/bin/inxi_snapshot
@@ -1,11 +1,11 @@
 #!/usr/bin/env perl
 ## infobash: Copyright (C) 2005-2007  Michiel de Boer aka locsmif
-## inxi: Copyright (C) 2008-2018 Harald Hope
+## inxi: Copyright (C) 2008-2021 Harald Hope
 ##       Additional features (C) Scott Rogers - kde, cpu info
 ## Further fixes (listed as known): Horst Tritremmel <hjt at sidux.com>
 ## Steven Barrett (aka: damentz) - usb audio patch; swap percent used patch
-## Jarett.Stevens - dmidecode -M patch for older systems with the /sys
-##
+## Jarett.Stevens - dmidecode -M patch for older systems without /sys machine
+## 
 ## License: GNU GPL v3 or greater
 ##
 ## You should have received a copy of the GNU General Public License
@@ -13,83 +13,106 @@
 ##
 ## If you don't understand what Free Software is, please read (or reread)
 ## this page: http://www.gnu.org/philosophy/free-sw.html
+## 
+## DEVS: NOTE: geany/scite folding is picky. Leave 1 space after # or it breaks!
 
 use strict;
 use warnings;
 # use diagnostics;
 use 5.008;
 
-use Cwd qw(abs_path); # qw(abs_path);#abs_path realpath getcwd
+## Perl 7 things for testing: depend on Perl 5.032
+# use 5.032;
+# use compat::perl5;  # act like Perl 5's defaults
+# no feature qw(indirect);
+# no multidimensional;
+# no bareword::filehandles;
+
+use Cwd qw(abs_path); # #abs_path realpath getcwd
 use Data::Dumper qw(Dumper); # print_r
-use File::Find;
+# NOTE: load in SystemDebugger unless encounter issues with require/import
+# use File::Find;
+use File::stat; # needed for Xorg.0.log file mtime comparisons
 use Getopt::Long qw(GetOptions);
-# Note: default auto_abbrev is enabled, that's fine
+# Note: default auto_abbrev is enabled
 Getopt::Long::Configure ('bundling', 'no_ignore_case', 
 'no_getopt_compat', 'no_auto_abbrev','pass_through');
-use POSIX qw(uname strftime ttyname);
-# use feature qw(state);
+use POSIX qw(ceil uname strftime ttyname);
+# use Benchmark qw(:all);_
+# use Devel::Size qw(size total_size);
+# use feature qw(say state); # 5.10 or newer Perl
+
+### INITIALIZE VARIABLES ###
 
 ## INXI INFO ##
 my $self_name='inxi';
-my $self_version='3.0.27';
-my $self_date='2018-10-14';
+my $self_version='3.3.06';
+my $self_date='2021-07-21';
 my $self_patch='00';
 ## END INXI INFO ##
 
-### INITIALIZE VARIABLES ###
+my ($b_pledge,@pledges);
+if (eval {require OpenBSD::Pledge}){
+	OpenBSD::Pledge->import();
+	$b_pledge = 1;
+	# cpath/wpath: dir/files .inxi, --debug > 9, -c 9x, -w/W; 
+	# dns/inet: ftp upload --debug > 20; exec/proc/rpath: critical; 
+	# prot_exec: Perl import; getpw: perl getpwuid() -c 9x, Net::FTP --debug > 20; 
+	# stdio: default; error: debugging pledge/perl
+	# tested. not required: mcast pf ps recvfd sendfd tmppath tty unix vminfo; 
+	# Pledge removal: OptionsHandler::post_process() [dns,inet,cpath,getpw,wpath];
+	# SelectColors::set_selection() [getpw]
+	@pledges = qw(cpath dns exec getpw inet proc prot_exec rpath wpath);
+	pledge(@pledges);
+}
 
 ## Self data
-my ($self_path, $user_config_dir, $user_config_file,$user_data_dir);
+my ($self_path,$user_config_dir,$user_config_file,$user_data_dir);
+
+## Hashes
+my (%alerts,%build_prop,%client,%colors,%disks_bsd,%dboot,%devices,%dl,
+%dmmapper,%force,%loaded,%mapper,%program_values,%rows,%sensors_raw,
+%service_tool,%show,%sysctl,%system_files,%usb);
+
+## System Arrays
+my (@app,@dmi,@gpudata,@ifs,@ifs_bsd,@paths,@ps_aux,@ps_cmd,@ps_gui,
+@sensors_exclude,@sensors_use,@uname);
+
+## Disk/Logical/Partition/RAID arrays 
+my (@btrfs_raid,@glabel,@labels,@lsblk,@lvm,@lvm_raid,@md_raid,@partitions,
+@proc_partitions,@raw_logical,@soft_raid,@swaps,@uuids,@zfs_raid);
 
 ## Debuggers
-my $debug=0;
-my (@t0,$end,$start,$fh_l,$log_file); # log file handle, file
-my ($b_hires,$t1,$t2,$t3) = (0,0,0,0);
+my %debugger = ('level' => 0);
+my (@dbg,%fake,@t0);
+my ($b_hires,$b_log,$b_log_colors,$b_log_full);
+my ($end,$start,$fh_l,$log_file); # log file handle, file
+my ($t1,$t2,$t3) = (0,0,0); # timers
+## debug / temp tools
+$debugger{'sys'} = 1;
+$client{'test-konvi'} = 0;
+
 # NOTE: redhat removed HiRes from Perl Core Modules. 
 if (eval {require Time::HiRes}){
-    Time::HiRes->import('gettimeofday','tv_interval','usleep');
-    $b_hires = 1;
+	Time::HiRes->import('gettimeofday','tv_interval','usleep');
+	$b_hires = 1;
 }
 @t0 = eval 'Time::HiRes::gettimeofday()' if $b_hires; # let's start it right away
-## Hashes
-my ( %alerts,%client,%colors,%debugger,%dl,%files,%rows,%system_files,%use );
-
-## Arrays
-# ps_aux is full output, ps_cmd is only the last 10 columns to last
-my (@app,@dmesg_boot,@devices_audio,@devices_graphics,@devices_network,
-@devices_hwraid,@devices_timer,@dmi,@gpudata,@ifs,@ifs_bsd,
-@paths,@proc_partitions,@ps_aux,@ps_cmd,@ps_gui,
-@sysctl,@sysctl_battery,@sysctl_sensors,@sysctl_machine,@uname,@usb);
-## Disk arrays 
-my (@dm_boot_disk,@dm_boot_optical,@glabel,@gpart,@hardware_raid,@labels,
-@lsblk,@partitions,@raid,@sysctl_disks,@uuids);
-my @test = (0,0,0,0,0);
-
-## Booleans
-my ($b_admin,$b_arm,$b_bb_ps,$b_block_tool,$b_console_irc,
-$b_display,$b_dmesg_boot_check,$b_dmi,$b_dmidecode_force,
-$b_fake_bsd,$b_fake_dboot,$b_fake_dmidecode,$b_fake_pciconf,$b_fake_sysctl,
-$b_fake_usbdevs,$b_force_display,$b_gpudata,$b_irc,
-$b_log,$b_log_colors,$b_log_full,$b_man,$b_mem,$b_mips,
-$b_pci,$b_pci_tool,$b_ppc,$b_proc_partitions,$b_ps_gui,
-$b_root,$b_running_in_display,
-$b_slot_tool,$b_soc_audio,$b_soc_gfx,$b_soc_net,$b_soc_timer,$b_sparc,
-$b_sudo,$b_sysctl,$b_usb,$b_usb_check,$b_usb_sys,$b_usb_tool,$b_wmctrl);
-## Disk checks
-my ($b_dm_boot_disk,$b_dm_boot_optical,$b_glabel,$b_hardware_raid,
-$b_label_uuid,$b_lsblk,$b_partitions,$b_raid);
-my ($b_sysctl_disk,$b_update,$b_weather) = (1,1,1);
+
+## Booleans [busybox_ps not used actively]
+my ($b_admin,$b_android,$b_arm,$b_busybox_ps,$b_display,$b_irc,
+$b_mips,$b_ppc,$b_root,$b_running_in_display,$b_sparc);
 
 ## System
-my ($bsd_type,$language,$os,$pci_tool,$device_vm) = ('','','','','');
-my ($bits_sys,$cpu_arch);
+my ($bsd_type,$device_vm,$language,$os,$pci_tool,$wan_url) = ('','','','','','');
+my ($bits_sys,$cpu_arch,$ppid);
 my ($cpu_sleep,$dl_timeout,$limit,$ps_cols,$ps_count) = (0.35,4,10,0,5);
 my $sensors_cpu_nu = 0;
-my $weather_unit='mi';
+my ($dl_ua,$weather_source,$weather_unit) = ('s-tools/' . $self_name  . '-',100,'mi');
 
 ## Tools
-my ($display,$ftp_alt,$tty_session);
-my ($display_opt,$sudo) = ('','');
+my ($bt_tool,$display,$ftp_alt);
+my ($display_opt,$sudoas) = ('','');
 
 ## Output
 my $extra = 0;# supported values: 0-3
@@ -98,26 +121,25 @@ my $line1 = "-------------------------------------------------------------------
 my $line2 = "======================================================================\n";
 my $line3 = "----------------------------------------\n";
 my ($output_file,$output_type) = ('','screen');
-my $prefix = 0; # for the primiary row hash key prefix
+my $prefix = 0; # for the primary row hash key prefix
 
-# these will assign a separator to non irc states. Important! Using ':' can 
+## Initialize internal hashes
+# these assign a separator to non irc states. Important! Using ':' can 
 # trigger stupid emoticon. Note: SEP1/SEP2 from short form not used anymore.
 # behaviors in output on IRC, so do not use those.
-my %sep = ( 
+my %sep = (
 's1-irc' => ':',
 's1-console' => ':',
 's2-irc' => '',
 's2-console' => ':',
 );
-
-my %show = ('host' => 1);
-
+#$show{'host'} = 1;
 my %size = (
 'console' => 115,
 # Default indentation level. NOTE: actual indent is 1 greater to allow for 
 # spacing
 'indent' => 11,
-'indent-min' => 90,
+'wrap-max' => 90,
 'irc' => 100, # shorter because IRC clients have nick  lists etc
 'max' => 0,
 'no-display' => 130,
@@ -125,10 +147,10 @@ my %size = (
 'term' => 80,
 'term-lines' => 100,
 );
-
-## debug / temp tools
-$debugger{'sys'} = 1;
-$client{'test-konvi'} = 0;
+my %use = (
+'update' => 1, # switched off/on with maintainer config ALLOW_UPDATE
+'weather' => 1, # switched off/on with maintainer config ALLOW_WEATHER
+);
 
 ########################################################################
 #### STARTUP
@@ -139,28 +161,29 @@ $client{'test-konvi'} = 0;
 #### -------------------------------------------------------------------
 
 sub main {
-#   print Dumper \@ARGV;
-    eval $start if $b_log;
-    initialize();
-    ## use for start client debugging
-    # $debug = 10; # 3 prints timers
-    # set_debugger(); # for debugging of konvi issues
-    #my $ob_start = StartClient->new();
-    #$ob_start->get_client_data();
-    StartClient::get_client_data();
-    # print_line( Dumper \%client);
-    get_options();
-    set_debugger(); # right after so it's set
-    check_tools();
-    set_colors();
-    set_sep();
-    # print download_file('stdout','https://') . "\n";
-    generate_lines();
-    eval $end if $b_log;
-    cleanup();
-    # weechat's executor plugin forced me to do this, and rightfully so, 
-    # because else the exit code from the last command is taken..
-    exit 0;
+# 	print Dumper \@ARGV;
+	eval $start if $b_log;
+	initialize();
+	## Uncomment these two values for start client debugging
+	# $debugger{'level'} = 3; # 3 prints timers / 10 prints to log file
+	# set_debugger(); # for debugging of konvi and other start client issues
+	## legacy method
+	# my $ob_start = StartClient->new();
+	#$ob_start->get_client_data();
+	StartClient::set();
+	# print_line(Dumper \%client);
+	OptionsHandler::get();
+	set_debugger(); # right after so it's set
+	CheckTools::set();
+	set_colors();
+	set_sep();
+	# print download_file('stdout','https://') . "\n";
+	OutputGenerator::generate();
+	eval $end if $b_log;
+	cleanup();
+	# weechat's executor plugin forced me to do this, and rightfully so, 
+	# because else the exit code from the last command is taken..
+	exit 0;
 }
 
 #### -------------------------------------------------------------------
@@ -168,417 +191,515 @@ sub main {
 #### -------------------------------------------------------------------
 
 sub initialize {
-    set_os();
-    set_path();
-    set_user_paths();
-    set_basics();
-    system_files('set');
-    get_configs();
-    # set_downloader();
-    set_display_width('live');
-}
-
-sub check_tools {
-    my ($action,$program,$message,@data,%commands,%hash);
-    if ( $b_dmi ){
-        $action = 'use';
-        if ($program = check_program('dmidecode')) {
-            @data = grabber("$program -t chassis -t baseboard -t processor 2>&1");
-            if (scalar @data < 15){
-                if ($b_root) {
-                    foreach (@data){
-                        if ($_ =~ /No SMBIOS/i){
-                            $action = 'smbios';
-                            last;
-                        }
-                        elsif ($_ =~ /^\/dev\/mem: Operation/i){
-                            $action = 'no-data';
-                            last;
-                        }
-                        else {
-                            $action = 'unknown-error';
-                            last;
-                        }
-                    }
-                }
-                else {
-                    if (grep { $_ =~ /^\/dev\/mem: Permission/i } @data){
-                        $action = 'permissions';
-                    }
-                    else {
-                        $action = 'unknown-error';
-                    }
-                }
-            }
-        }
-        else {
-            $action = 'missing';
-        }
-        %hash = (
-        'dmidecode' => {
-        'action' => $action,
-        'missing' => 'Required program dmidecode not available',
-        'permissions' => 'Unable to run dmidecode. Are you root?',
-        'smbios' => 'No SMBIOS data for dmidecode to process',
-        'no-data' => 'dmidecode is not allowed to read /dev/mem',
-        'unknown-error' => 'dmidecode was unable to generate data',
-        },
-        );
-        %alerts = (%alerts, %hash);
-    }
-    # note: gnu/linux has sysctl so it may be used that for something if present
-    # there is lspci for bsds so doesn't hurt to check it
-    if ($b_pci || $b_sysctl){
-        if (!$bsd_type){
-            if ($b_pci ){
-                %hash = ('lspci' => '-n',);
-                %commands = (%commands,%hash);
-            }
-        }
-        else {
-            if ($b_pci ){
-                %hash = ('pciconf' => '-l','pcictl' => 'list', 'pcidump' => '');
-                %commands = (%commands,%hash);
-            }
-            if ($b_sysctl ){
-                # note: there is a case of kernel.osrelease but it's a linux distro
-                %hash = ('sysctl' => 'kern.osrelease',);
-                %commands = (%commands,%hash);
-            }
-        }
-        foreach ( keys %commands ){
-            $action = 'use';
-            if ($program = check_program($_)) {
-                # > 0 means error in shell
-                #my $cmd = "$program $commands{$_} >/dev/null";
-                #print "$cmd\n";
-                $pci_tool = $_ if $_ =~ /pci/;
-                $action = 'permissions' if system("$program $commands{$_} >/dev/null 2>&1");
-            }
-            else {
-                $action = 'missing';
-            }
-            %hash = (
-            $_ => {
-            'action' => $action,
-            'missing' => "Missing system tool: $_. Output will be incomplete",
-            'permissions' => "Unable to run $_. Root required?",
-            },
-            );
-            %alerts = (%alerts, %hash);
-        }
-    }
-    %commands = ();
-    if ( $show{'sensor'} ){
-        %commands = ('sensors' => 'linux',);
-    }
-    # note: lsusb ships in FreeBSD ports sysutils/usbutils
-    if ( $b_usb ){
-        %hash = ('lsusb' => 'all',);
-        %commands = (%commands,%hash);
-        %hash = ('usbdevs' => 'bsd',);
-        %commands = (%commands,%hash);
-    }
-    if ($show{'ip'} || ($bsd_type && $show{'network-advanced'})){
-        %hash = (
-        'ip' => 'linux',
-        'ifconfig' => 'all',
-        );
-        %commands = (%commands,%hash);
-    }
-    # can't check permissions since we need to know the partition
-    if ($b_block_tool){
-        %hash = (
-        'blockdev' => 'linux',
-        'lsblk' => 'linux',
-        );
-        %commands = (%commands,%hash);
-    }
-    foreach ( keys %commands ){
-        $action = 'use';
-        $message = 'Present and working';
-        if ( ($commands{$_} eq 'linux' && $os ne 'linux' ) || ($commands{$_} eq 'bsd' && $os eq 'linux' ) ){
-            $message = "No " . ucfirst($os) . " support. Is a comparable $_ tool available?";
-            $action = 'platform';
-        }
-        elsif (!check_program($_)){
-            $message = "Required tool $_ not installed. Check --recommends";
-            $action = 'missing';
-        }
-        %hash = (
-        $_ => {
-        'action' => $action,
-        'missing' => $message,
-        'platform' => $message,
-        },
-        );
-        %alerts = (%alerts, %hash);
-    }
-    # print Dumper \%alerts;
-    # only use sudo if not root, -n option requires sudo -V 1.7 or greater. 
-    # for some reason sudo -n with < 1.7 in Perl does not print to stderr
-    # sudo will just error out which is the safest course here for now,
-    # otherwise that interactive sudo password thing is too annoying
-    # important: -n makes it non interactive, no prompt for password
-    if (!$b_root && $b_sudo && (my $path = main::check_program('sudo') )) {
-        my @data = program_values('sudo');
-        my $version = program_version($path,$data[0],$data[1],$data[2],$data[5]);
-        $version =~ s/^([0-9]+\.[0-9]+).*/$1/;
-        $sudo = "$path -n " if $version >= 1.7;
-    }
-    set_fake_tools() if $b_fake_bsd;
+	set_os();
+	set_path();
+	set_user_paths();
+	set_basics();
+	set_system_files();
+	Configs::set();
+	# set_downloader();
+	set_display_width('live');
+}
+
+## CheckTools
+{
+package CheckTools;
+my (%commands);
+sub set {
+	eval $start if $b_log;
+	set_commands();
+	my ($action,$program,$message,@data);
+	foreach my $test (keys %commands){
+		($action,$program) = ('use','');
+		$message = main::row_defaults('tool-present');
+		if ($commands{$test}->[1] && (
+			($commands{$test}->[1] eq 'linux' && $os ne 'linux') || 
+			($commands{$test}->[1] eq 'bsd' && $os eq 'linux'))){
+			$action = 'platform';
+		}
+		elsif ($program = main::check_program($test)){
+			# > 0 means error in shell
+			# my $cmd = "$program $commands{$test} >/dev/null";
+			# print "$cmd\n";
+			$pci_tool = $test if $test =~ /pci/;
+			if ($commands{$test}->[0] eq 'exec-sys'){
+				$action = 'permissions' if system("$program $commands{$test}->[2] >/dev/null 2>&1");
+			}
+			elsif ($commands{$test}->[0] eq 'exec-string'){
+				@data = main::grabber("$program $commands{$test}->[2] 2>&1");
+				# dmidecode errors are so specific it gets its own section
+				# also sets custom dmidecode error messages
+				if ($test eq 'dmidecode'){
+					$action = set_dmidecode(\@data) if scalar @data < 15;
+				}
+				elsif (grep { $_ =~ /$commands{$test}->[3]/i } @data){
+					$action = 'permissions';
+				}
+			}
+		}
+		else {
+			$action = 'missing';
+		}
+		$alerts{$test}->{'action'} = $action;
+		$alerts{$test}->{'path'} = $program;
+		if ($action eq 'missing'){
+			$alerts{$test}->{'message'} = main::row_defaults('tool-missing-recommends',"$test");
+		}
+		elsif ($action eq 'permissions'){
+			$alerts{$test}->{'message'} = main::row_defaults('tool-permissions',"$test");
+		}
+		elsif ($action eq 'platform'){
+			$alerts{$test}->{'message'} = main::row_defaults('tool-missing-os', $uname[0] . " $test");
+		}
+	}
+	print Data::Dumper::Dumper \%alerts if $dbg[25];
+	set_fake_bsd_tools() if $fake{'bsd'};
+	set_forced_tools();
+	eval $end if $b_log;
+}
+sub set_dmidecode {
+	my ($data) = @_;
+	my $action = 'use';
+	if ($b_root){
+		foreach (@$data){
+			# don't need first line or scanning /dev/mem lines
+			if (/^(# dmi|Scanning)/){
+				next;
+			}
+			elsif ($_ =~ /No SMBIOS/i){
+				$action = 'smbios';
+				last;
+			}
+			elsif ($_ =~ /^\/dev\/mem: Operation/i){
+				$action = 'no-data';
+				last;
+			}
+			else {
+				$action = 'unknown-error';
+				last;
+			}
+		}
+	}
+	else {
+		if (grep { $_ =~ /^\/dev\/mem: Permission/i } @$data){
+			$action = 'permissions';
+		}
+		else {
+			$action = 'unknown-error';
+		}
+	}
+	if ($action ne 'use' && $action ne 'permissions'){
+		if ($action eq 'smbios'){
+			$alerts{'dmidecode'}->{'message'} = main::row_defaults('dmidecode-smbios');
+		}
+		elsif ($action eq 'no-data'){
+			$alerts{'dmidecode'}->{'message'} = main::row_defaults('dmidecode-dev-mem');
+		}
+		elsif ($action eq 'unknown-error'){
+			$alerts{'dmidecode'}->{'message'} = main::row_defaults('tool-unknown-error','dmidecode');
+		}
+	}
+	return $action;
+}
+sub set_commands {
+	# note: gnu/linux has sysctl so it may be used that for something if present
+	# there is lspci for bsds so doesn't hurt to check it
+	if (!$bsd_type){
+		if ($use{'pci'}){
+			$commands{'lspci'} = ['exec-sys','','-n'];
+		}
+		if ($use{'logical'}){
+			$commands{'lvs'} = ['exec-sys','',''];
+		}
+	}
+	else {
+		if ($use{'pci'}){
+			$commands{'pciconf'} = ['exec-sys','','-l'];
+			$commands{'pcictl'} = ['exec-sys','',' pci0 list'];
+			$commands{'pcidump'} = ['exec-sys','',''];
+		}
+		if ($use{'sysctl'}){
+			# note: there is a case of kernel.osrelease but it's a linux distro
+			$commands{'sysctl'} = ['exec-sys','','kern.osrelease'];
+		}
+		if ($use{'bsd-partition'}){
+			$commands{'bioctl'} = ['missing','',''];
+			$commands{'disklabel'} = ['missing','',''];
+			$commands{'fdisk'} = ['missing','',''];
+			$commands{'gpart'} = ['missing','',''];
+		}
+	}
+	if ($use{'dmidecode'}){
+		$commands{'dmidecode'} = ['exec-string','','-t chassis -t baseboard -t processor',''];
+	}
+	if ($use{'usb'}){
+		# note: lsusb ships in FreeBSD ports sysutils/usbutils
+		$commands{'lsusb'} = ['missing','','',''];
+		# we want these set for various null bsd data tests
+		$commands{'usbconfig'} = ['exec-string','bsd','list','permissions'];
+		$commands{'usbdevs'} = ['missing','bsd','',''];
+	}
+	if ($show{'bluetooth'}){
+		$commands{'bluetoothctl'} = ['missing','linux','',''];
+		# bt-adapter hangs when bluetooth service is disabled
+		$commands{'bt-adapter'} = ['missing','linux','',''];
+		$commands{'hciconfig'} = ['missing','linux','',''];
+	}
+	if ($show{'sensor'}){
+		$commands{'sensors'} = ['missing','linux','',''];
+	}
+	if ($show{'ip'} || ($bsd_type && $show{'network-advanced'})){
+		$commands{'ip'} = ['missing','linux','',''];
+		$commands{'ifconfig'} = ['missing','','',''];
+	}
+	# can't check permissions since we need to know the partition/disc
+	if ($use{'block-tool'}){
+		$commands{'blockdev'} = ['missing','linux','',''];
+		$commands{'lsblk'} = ['missing','linux','',''];
+	}
+	if ($use{'btrfs'}){
+		$commands{'btrfs'} = ['missing','linux','',''];
+	}
+	if ($use{'mdadm'}){
+		$commands{'mdadm'} = ['missing','linux','',''];
+	}
+	if ($use{'smartctl'}){
+		$commands{'smartctl'} = ['missing','','',''];
+	}
+	if ($show{'unmounted'}){
+		$commands{'disklabel'} = ['missing','bsd','xx'];
+	}
+}
+sub set_forced_tools {
+	if ($bt_tool){
+		if ($bt_tool ne 'bluetootctl' && $alerts{'bluetoothctl'}->{'action'} eq 'use'){
+			$alerts{'bluetoothctl'}->{'action'} = 'missing';
+		}
+		if ($bt_tool ne 'bt-adapter' && $alerts{'bt-adapter'}->{'action'} eq 'use'){
+			$alerts{'bt-adapter'}->{'action'} = 'missing';
+		}
+		if ($bt_tool ne 'hciconfig' && $alerts{'hciconfig'}->{'action'} eq 'use'){
+			$alerts{'hciconfig'}->{'action'} = 'missing';
+		}
+	}
+}
+# only for dev/debugging BSD 
+sub set_fake_bsd_tools {
+	$system_files{'dmesg-boot'} = '/var/run/dmesg.boot' if $fake{'dboot'};
+	$alerts{'sysctl'}->{'action'} = 'use' if $fake{'sysctl'};
+	if ($fake{'pciconf'} || $fake{'pcictl'} || $fake{'pcidump'}){
+		$alerts{'pciconf'}->{'action'} = 'use' if $fake{'pciconf'};
+		$alerts{'pcictl'}->{'action'} = 'use' if $fake{'pcictl'};
+		$alerts{'pcidump'}->{'action'} = 'use' if $fake{'pcidump'};
+		$alerts{'lspci'} = {
+		'action' => 'missing',
+		'message' => 'Required program lspci not available',
+		};
+	}
+	if ($fake{'usbconfig'} || $fake{'usbdevs'}){
+		$alerts{'usbconfig'}->{'action'} = 'use' if $fake{'usbconfig'};
+		$alerts{'usbdevs'}->{'action'} = 'use' if $fake{'usbdevs'};
+		$alerts{'lsusb'} = {
+		'action' => 'missing',
+		'message' => 'Required program lsusb not available',
+		};
+	}
+	if ($fake{'disklabel'}){
+		$alerts{'disklabel'}->{'action'} = 'use';
+	}
+}
 }
 
 # args: 1 - desktop/app command for --version; 2 - search string; 
 # 3 - space print number; 4 - [optional] version arg: -v, version, etc
 # 5 - [optional] exit first find 0/1; 6 - [optional] 0/1 stderr output
 sub set_basics {
-    ### LOCALIZATION - DO NOT CHANGE! ###
-    # set to default LANG to avoid locales errors with , or .
-    # Make sure every program speaks English.
-    $ENV{'LANG'}='C';
-    $ENV{'LC_ALL'}='C';
-    # remember, perl uses the opposite t/f return as shell!!!
-    # some versions of busybox do not have tty, like openwrt
-    $b_irc = ( check_program('tty') && system('tty >/dev/null') ) ? 1 : 0;
-    # print "birc: $b_irc\n";
-    $b_display = ( $ENV{'DISPLAY'} ) ? 1 : 0;
-    $b_root = ( $ENV{'HOME'} eq '/root' ) ? 1 : 0;
-    $dl{'dl'} = 'curl';
-    $dl{'curl'} = 1;
-    $dl{'tiny'} = 1; # note: two modules needed, tested for in set_downloader
-    $dl{'wget'} = 1;
-    $dl{'fetch'} = 1;
-    $client{'console-irc'} = 0;
-    $client{'dcop'} = (check_program('dcop')) ? 1 : 0;
-    $client{'qdbus'} = (check_program('qdbus')) ? 1 : 0;
-    $client{'konvi'} = 0;
-    $client{'name'} = '';
-    $client{'name-print'} = '';
-    $client{'su-start'} = ''; # shows sudo/su
-    $client{'version'} = '';
-    $colors{'default'} = 2;
-    $show{'partition-sort'} = 'id'; # sort order for partitions
+	### LOCALIZATION - DO NOT CHANGE! ###
+	# set to default LANG to avoid locales errors with , or .
+	# Make sure every program speaks English.
+	$ENV{'LANG'}='C';
+	$ENV{'LC_ALL'}='C';
+	# remember, perl uses the opposite t/f return as shell!!!
+	# some versions of busybox do not have tty, like openwrt
+	$b_irc = (check_program('tty') && system('tty >/dev/null')) ? 1 : 0;
+	# print "birc: $b_irc\n";
+	$b_display = ($ENV{'DISPLAY'}) ? 1 : 0;
+	$b_root = $< == 0; # root UID 0, all others > 0
+	$dl{'dl'} = 'curl';
+	$dl{'curl'} = 1;
+	$dl{'tiny'} = 1; # note: two modules needed, tested for in set_downloader
+	$dl{'wget'} = 1;
+	$dl{'fetch'} = 1;
+	$client{'console-irc'} = 0;
+	$client{'dcop'} = (check_program('dcop')) ? 1 : 0;
+	$client{'qdbus'} = (check_program('qdbus')) ? 1 : 0;
+	$client{'konvi'} = 0;
+	$client{'name'} = '';
+	$client{'name-print'} = '';
+	$client{'su-start'} = ''; # shows sudo/su
+	$client{'version'} = '';
+	$colors{'default'} = 2;
+	$show{'partition-sort'} = 'id'; # sort order for partitions
+	@raw_logical = (0,0,0);
+	$ppid = getppid();
 }
 
 # args: $1 - default OR override default cols max integer count. $_[0]
 # is the display width override.
 sub set_display_width {
-    my ($width) = @_;
-    if ( $width eq 'live' ){
-        ## sometimes tput will trigger an error (mageia) if irc client
-        if ( ! $b_irc ){
-            if ( check_program('tput') ) {
-                # trips error if use qx()...
-                chomp($size{'term'}=qx{tput cols});
-                chomp($size{'term-lines'}=qx{tput lines});
-                $size{'term-cols'} = $size{'term'};
-            }
-            # print "tc: $size{'term'} cmc: $size{'console'}\n";
-            # double check, just in case it's missing functionality or whatever
-            if ( $size{'term'} == 0 || $size{'term'} !~ /\d/ ){ 
-                $size{'term'}=80;
-                # we'll be using this for terminal dimensions later so don't set default.
-                # $size{'term-lines'}=100;
-            }
-        }
-        # this lets you set different size for in or out of display server
-        if ( ! $b_running_in_display && $size{'no-display'} ){
-            $size{'console'}=$size{'no-display'};
-        }
-        # term_cols is set in top globals, using tput cols
-        # print "tc: $size{'term'} cmc: $size{'console'}\n";
-        if ( $size{'term'} < $size{'console'} ){
-            $size{'console'}=$size{'term'};
-        }
-        # adjust, some terminals will wrap if output cols == term cols
-        $size{'console'}=( $size{'console'} - 2 );
-        # echo cmc: $size{'console'}
-        # comes after source for user set stuff
-        if ( ! $b_irc ){
-            $size{'max'}=$size{'console'};
-        }
-        else {
-            $size{'max'}=$size{'irc'};
-        }
-    }
-    else {
-        $size{'max'}=$width;
-    }
-    # print "tc: $size{'term'} cmc: $size{'console'} cm: $size{'max'}\n";
-}
-
-# only for dev/debugging BSD 
-sub set_fake_tools {
-    $system_files{'dmesg-boot'} = '/var/run/dmesg.boot' if $b_fake_dboot;
-    $alerts{'pciconf'} = ({'action' => 'use'}) if $b_fake_pciconf;
-    $alerts{'sysctl'} = ({'action' => 'use'}) if $b_fake_sysctl;
-    if ($b_fake_usbdevs ){
-        $alerts{'usbdevs'} = ({'action' => 'use'});
-        $alerts{'lsusb'} = ({
-        'action' => 'missing',
-        'missing' => 'Required program lsusb not available',
-        });
-    }
+	my ($width) = @_;
+	if ($width eq 'live'){
+		## sometimes tput will trigger an error (mageia) if irc client
+		if (!$b_irc){
+			if (my $program = check_program('tput')){
+				# Arch urxvt: 'tput: unknown terminal "rxvt-unicode-256color"'
+				# trips error if use qx(); in FreeBSD, if you use 2>/dev/null 
+				# it makes default value 80x24, who knows why?
+				chomp($size{'term'} = qx{$program cols});
+				chomp($size{'term-lines'} = qx{$program lines});
+				$size{'term-cols'} = $size{'term'};
+			}
+			# print "tc: $size{'term'} cmc: $size{'console'}\n";
+			# double check, just in case it's missing functionality or whatever
+			if (!is_int($size{'term'} || $size{'term'} == 0)){ 
+				$size{'term'}=80;
+				# we'll be using this for terminal dimensions later so don't set default.
+				# $size{'term-lines'}=100;
+			}
+		}
+		# this lets you set different size for in or out of display server
+		if (!$b_running_in_display && $size{'no-display'}){
+			$size{'console'} = $size{'no-display'};
+		}
+		# term_cols is set in top globals, using tput cols
+		# print "tc: $size{'term'} cmc: $size{'console'}\n";
+		if ($size{'term'} < $size{'console'}){
+			$size{'console'} = $size{'term'};
+		}
+		# adjust, some terminals will wrap if output cols == term cols
+		$size{'console'} = ($size{'console'} - 2);
+		# echo cmc: $size{'console'}
+		# comes after source for user set stuff
+		if (!$b_irc){
+			$size{'max'} = $size{'console'};
+		}
+		else {
+			$size{'max'} = $size{'irc'};
+		}
+	}
+	else {
+		$size{'max'} = $width;
+	}
+	# print "tc: $size{'term'} cmc: $size{'console'} cm: $size{'max'}\n";
 }
 
 # NOTE: most tests internally are against !$bsd_type
 sub set_os {
-    @uname = uname();
-    $os = lc($uname[0]);
-    $cpu_arch = lc($uname[-1]);
-    if ($cpu_arch =~ /arm|aarch/){$b_arm = 1}
-    elsif ($cpu_arch =~ /mips/) {$b_mips = 1}
-    elsif ($cpu_arch =~ /power|ppc/) {$b_ppc = 1}
-    elsif ($cpu_arch =~ /sparc/) {$b_sparc = 1}
-    # aarch32 mips32 intel/amd handled in cpu
-    if ($cpu_arch =~ /(armv[1-7]|32|sparc_v9)/){
-        $bits_sys = 32;
-    }
-    elsif ($cpu_arch =~ /(alpha|64)/){
-        $bits_sys = 64;
-    }
-    if ( $os =~ /(aix|bsd|cosix|dragonfly|darwin|hp-?ux|indiana|irix|sunos|solaris|ultrix|unix)/ ){
-        if ( $os =~ /openbsd/ ){
-            $os = 'openbsd';
-        }
-        elsif ($os =~ /darwin/){
-            $os = 'darwin';
-        }
-        if ($os =~ /kfreebsd/){
-            $bsd_type = 'debian-bsd';
-        }
-        else {
-            $bsd_type = $os;
-        }
-    }
-}
-
-# This data is hard set top of program but due to a specific project's
-# foolish idea that ignoring the FSH totally is somehow a positive step
-# forwards for free software, we also have to padd the results with PATH.
+	@uname = uname();
+	$os = lc($uname[0]);
+	$cpu_arch = lc($uname[-1]);
+	if ($cpu_arch =~ /arm|aarch/){$b_arm = 1;}
+	elsif ($cpu_arch =~ /mips/){$b_mips = 1}
+	elsif ($cpu_arch =~ /power|ppc/){$b_ppc = 1}
+	elsif ($cpu_arch =~ /sparc/){$b_sparc = 1}
+	# aarch32 mips32 intel/amd handled in cpu
+	if ($cpu_arch =~ /(armv[1-7]|32|sparc_v9)/){
+		$bits_sys = 32;
+	}
+	elsif ($cpu_arch =~ /(alpha|64|e2k)/){
+		$bits_sys = 64;
+	}
+	$b_android = 1 if -e '/system/build.prop';
+	if ($os =~ /(aix|bsd|cosix|dragonfly|darwin|hp-?ux|indiana|irix|sunos|solaris|ultrix|unix)/){
+		if ($os =~ /openbsd/){
+			$os = 'openbsd';
+		}
+		elsif ($os =~ /darwin/){
+			$os = 'darwin';
+		}
+		if ($os =~ /kfreebsd/){
+			$bsd_type = 'debian-bsd';
+		}
+		else {
+			$bsd_type = $os;
+		}
+	}
+}
+
+# Sometimes users will have more PATHs local to their setup, so we want those
+# too.
 sub set_path {
-    # Extra path variable to make execute failures less likely, merged below
-    my (@path);
-    # 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:
-    foreach my $id (@path) {
-        if ( !(grep { /^$id$/ } @paths) && $id !~ /(game)/ ){
-            push @paths, $id;
-        }
-    }
-    # print "paths: @paths\n";
+	# Extra path variable to make execute failures less likely, merged below
+	my (@path);
+	# 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:
+	foreach my $id (@path){
+		if (!(grep { /^$id$/ } @paths) && $id !~ /(game)/){
+			push(@paths, $id);
+		}
+	}
+	# print "paths: @paths\n";
 }
 
 sub set_sep {
-    if ( $b_irc ){
-        # too hard to read if no colors, so force that for users on irc
-        if ($colors{'scheme'} == 0 ){
-            $sep{'s1'} = $sep{'s1-console'};
-            $sep{'s2'} = $sep{'s2-console'};
-        }
-        else {
-            $sep{'s1'} = $sep{'s1-irc'};
-            $sep{'s2'} = $sep{'s2-irc'};
-        }
-    }
-    else {
-        $sep{'s1'} = $sep{'s1-console'};
-        $sep{'s2'} = $sep{'s2-console'};
-    }
+	if ($b_irc){
+		# too hard to read if no colors, so force that for users on irc
+		if ($colors{'scheme'} == 0){
+			$sep{'s1'} = $sep{'s1-console'};
+			$sep{'s2'} = $sep{'s2-console'};
+		}
+		else {
+			$sep{'s1'} = $sep{'s1-irc'};
+			$sep{'s2'} = $sep{'s2-irc'};
+		}
+	}
+	else {
+		$sep{'s1'} = $sep{'s1-console'};
+		$sep{'s2'} = $sep{'s2-console'};
+	}
+}
+
+# Important: -n makes it non interactive, no prompt for password
+# only use doas/sudo if not root, -n option requires sudo -V 1.7 or greater. 
+# for some reason sudo -n with < 1.7 in Perl does not print to stderr
+# sudo will just error out which is the safest course here for now,
+# otherwise that interactive sudo password thing is too annoying
+sub set_sudo {
+	if (!$b_root){
+		my ($path);
+		if (!$force{'no-doas'} && ($path = check_program('doas'))){
+			$sudoas = "$path -n ";
+		}
+		elsif (!$force{'no-sudo'} && ($path = check_program('sudo'))){
+			my @data = program_data('sudo');
+			$data[1] =~ s/^([0-9]+\.[0-9]+).*/$1/;
+			# print "sudo v: $data[1]\n";
+			$sudoas = "$path -n " if is_numeric($data[1]) && $data[1] >= 1.7;
+		}
+	}
+}
+
+sub set_system_files {
+	my %files = (
+	'asound-cards' => '/proc/asound/cards',
+	'asound-modules' => '/proc/asound/modules',
+	'asound-version' => '/proc/asound/version',
+	'dmesg-boot' => '/var/run/dmesg.boot',
+	'proc-cmdline' => '/proc/cmdline',
+	'proc-cpuinfo' => '/proc/cpuinfo',
+	'proc-mdstat' => '/proc/mdstat',
+	'proc-meminfo' => '/proc/meminfo',
+	'proc-modules' => '/proc/modules', # not used
+	'proc-mounts' => '/proc/mounts',# not used
+	'proc-partitions' => '/proc/partitions',
+	'proc-scsi' => '/proc/scsi/scsi',
+	'proc-version' => '/proc/version',
+	# note: 'xorg-log' is set in set_xorg_log() only if -G is triggered
+	);
+	foreach (keys %files){
+		$system_files{$_} = (-e $files{$_}) ? $files{$_} : '';
+	}
 }
 
 sub set_user_paths {
-    my ( $b_conf, $b_data );
-    # this needs to be set here because various options call the parent 
-    # initialize function directly.
-    $self_path = $0;
-    $self_path =~ s/[^\/]+$//;
-    # print "0: $0 sp: $self_path\n";
-    
-    if ( defined $ENV{'XDG_CONFIG_HOME'} && $ENV{'XDG_CONFIG_HOME'} ){
-        $user_config_dir=$ENV{'XDG_CONFIG_HOME'};
-        $b_conf=1;
-    }
-    elsif ( -d "$ENV{'HOME'}/.config" ){
-        $user_config_dir="$ENV{'HOME'}/.config";
-        $b_conf=1;
-    }
-    else {
-        $user_config_dir="$ENV{'HOME'}/.$self_name";
-    }
-    if ( defined $ENV{'XDG_DATA_HOME'} && $ENV{'XDG_DATA_HOME'} ){
-        $user_data_dir="$ENV{'XDG_DATA_HOME'}/$self_name";
-        $b_data=1;
-    }
-    elsif ( -d "$ENV{'HOME'}/.local/share" ){
-        $user_data_dir="$ENV{'HOME'}/.local/share/$self_name";
-        $b_data=1;
-    }
-    else {
-        $user_data_dir="$ENV{'HOME'}/.$self_name";
-    }
-    # note, this used to be created/checked in specific instance, but we'll just do it
-    # universally so it's done at script start.
-    if ( ! -d $user_data_dir ){
-        mkdir $user_data_dir;
-        # system "echo", "Made: $user_data_dir";
-    }
-    if ( $b_conf && -f "$ENV{'HOME'}/.$self_name/$self_name.conf" ){
-        #system 'mv', "-f $ENV{'HOME'}/.$self_name/$self_name.conf", $user_config_dir;
-        # print "WOULD: Moved $self_name.conf from $ENV{'HOME'}/.$self_name to $user_config_dir\n";
-    }
-    if ( $b_data && -d "$ENV{'HOME'}/.$self_name" ){
-        #system 'mv', '-f', "$ENV{'HOME'}/.$self_name/*", $user_data_dir;
-        #system 'rm', '-Rf', "$ENV{'HOME'}/.$self_name";
-        # print "WOULD: Moved data dir $ENV{'HOME'}/.$self_name to $user_data_dir\n";
-    }
-    $log_file="$user_data_dir/$self_name.log";
-    #system 'echo', "$ENV{'HOME'}/.$self_name/* $user_data_dir";
-    # print "scd: $user_config_dir sdd: $user_data_dir \n";
-}
-
-# args: 1: set|hash key to return either null or path
-sub system_files {
-    my ($file) = @_;
-    if ( $file eq 'set'){
-        %files = (
-        'asound-cards' => '/proc/asound/cards',
-        'asound-modules' => '/proc/asound/modules',
-        'asound-version' => '/proc/asound/version',
-        'cpuinfo' => '/proc/cpuinfo',
-        'dmesg-boot' => '/var/run/dmesg.boot',
-        'lsb-release' => '/etc/lsb-release',
-        'mdstat' => '/proc/mdstat',
-        'meminfo' => '/proc/meminfo',
-        'modules' => '/proc/modules',
-        'mounts' => '/proc/mounts',
-        'os-release' => '/etc/os-release',
-        'partitions' => '/proc/partitions',
-        'scsi' => '/proc/scsi/scsi',
-        'version' => '/proc/version',
-        'xorg-log' => '/var/log/Xorg.0.log'
-        );
-        foreach ( keys %files ){
-            $system_files{$_} = ( -e $files{$_} ) ? $files{$_} : '';
-        }
-        if ( ! $system_files{'xorg-log'} && check_program('xset') ){
-            my $data = qx(xset q 2>/dev/null);
-            foreach ( split /\n/, $data){
-                if ($_ =~ /Log file/i){
-                    $system_files{'xorg-log'} = get_piece($_,3);
-                    last;
-                }
-            }
-        }
-    }
-    else {
-        return $system_files{$file};
-    }
+	my ($b_conf,$b_data);
+	# this needs to be set here because various options call the parent 
+	# initialize function directly.
+	$self_path = $0;
+	$self_path =~ s/[^\/]+$//;
+	# print "0: $0 sp: $self_path\n";
+	if (defined $ENV{'XDG_CONFIG_HOME'} && $ENV{'XDG_CONFIG_HOME'}){
+		$user_config_dir=$ENV{'XDG_CONFIG_HOME'};
+		$b_conf=1;
+	}
+	elsif (-d "$ENV{'HOME'}/.config"){
+		$user_config_dir="$ENV{'HOME'}/.config";
+		$b_conf=1;
+	}
+	else {
+		$user_config_dir="$ENV{'HOME'}/.$self_name";
+	}
+	if (defined $ENV{'XDG_DATA_HOME'} && $ENV{'XDG_DATA_HOME'}){
+		$user_data_dir="$ENV{'XDG_DATA_HOME'}/$self_name";
+		$b_data=1;
+	}
+	elsif (-d "$ENV{'HOME'}/.local/share"){
+		$user_data_dir="$ENV{'HOME'}/.local/share/$self_name";
+		$b_data=1;
+	}
+	else {
+		$user_data_dir="$ENV{'HOME'}/.$self_name";
+	}
+	# note, this used to be created/checked in specific instance, but we'll just 
+	# do it universally so it's done at script start.
+	if (! -d $user_data_dir){
+		mkdir $user_data_dir;
+		# system "echo", "Made: $user_data_dir";
+	}
+	if ($b_conf && -f "$ENV{'HOME'}/.$self_name/$self_name.conf"){
+		# system 'mv', "-f $ENV{'HOME'}/.$self_name/$self_name.conf", $user_config_dir;
+		# print "WOULD: Moved $self_name.conf from $ENV{'HOME'}/.$self_name to $user_config_dir\n";
+	}
+	if ($b_data && -d "$ENV{'HOME'}/.$self_name"){
+		# system 'mv', '-f', "$ENV{'HOME'}/.$self_name/*", $user_data_dir;
+		# system 'rm', '-Rf', "$ENV{'HOME'}/.$self_name";
+		# print "WOULD: Moved data dir $ENV{'HOME'}/.$self_name to $user_data_dir\n";
+	}
+	$log_file="$user_data_dir/$self_name.log";
+	# system 'echo', "$ENV{'HOME'}/.$self_name/* $user_data_dir";
+	# print "scd: $user_config_dir sdd: $user_data_dir \n";
+}
+
+sub set_xorg_log {
+	eval $start if $b_log;
+	my (@temp,@x_logs);
+	my ($file_holder,$time_holder,$x_mtime) = ('',0,0);
+	# NOTE: other variations may be /var/run/gdm3/... but not confirmed
+	# worry about we are just going to get all the Xorg logs we can find,
+	# and not which is 'right'.
+	@temp = globber('/var/log/Xorg.*.log');
+	push(@x_logs, @temp) if @temp;
+	@temp = globber('/var/lib/gdm/.local/share/xorg/Xorg.*.log');
+	push(@x_logs, @temp) if @temp;
+	@temp = globber($ENV{'HOME'} . '/.local/share/xorg/Xorg.*.log',);
+	push(@x_logs, @temp) if @temp;
+	# root will not have a /root/.local/share/xorg directory so need to use a 
+	# user one if we can find one.
+	if ($b_root){
+		@temp = globber('/home/*/.local/share/xorg/Xorg.*.log');
+		push(@x_logs, @temp) if @temp;
+	}
+	foreach (@x_logs){
+		if (-r $_){
+			my $src_info = File::stat::stat("$_");
+			# print "$_\n";
+			if ($src_info){
+				$x_mtime = $src_info->mtime;
+				# print $_ . ": $x_time" . "\n";
+				if ($x_mtime > $time_holder){
+					$time_holder = $x_mtime;
+					$file_holder = $_;
+				}
+			}
+		}
+	}
+	if (!$file_holder && check_program('xset')){
+		my $data = qx(xset q 2>/dev/null);
+		foreach (split('\n', $data)){
+			if ($_ =~ /Log file/i){
+				$file_holder = get_piece($_,3);
+				last;
+			}
+		}
+	}
+	print "Xorg log file: $file_holder\nLast modified: $time_holder\n" if $dbg[14];
+	log_data('data',"Xorg log file: $file_holder") if $b_log;
+	$system_files{'xorg-log'} = $file_holder;
+	eval $end if $b_log;
 }
 
 ########################################################################
@@ -591,425 +712,420 @@ sub system_files {
 
 ## arg: 1 - the type of action, either integer, count, or full
 sub get_color_scheme {
-    my ($type) = @_;
-    eval $start if $b_log;
-    my @color_schemes = (
-    [qw(EMPTY EMPTY EMPTY )],
-    [qw(NORMAL NORMAL NORMAL )],
-    # for dark OR light backgrounds
-    [qw(BLUE NORMAL NORMAL)],
-    [qw(BLUE RED NORMAL )],
-    [qw(CYAN BLUE NORMAL )],
-    [qw(DCYAN NORMAL NORMAL)],
-    [qw(DCYAN BLUE NORMAL )],
-    [qw(DGREEN NORMAL NORMAL )],
-    [qw(DYELLOW NORMAL NORMAL )],
-    [qw(GREEN DGREEN NORMAL )],
-    [qw(GREEN NORMAL NORMAL )],
-    [qw(MAGENTA NORMAL NORMAL)],
-    [qw(RED NORMAL NORMAL)],
-    # for light backgrounds
-    [qw(BLACK DGREY NORMAL)],
-    [qw(DBLUE DGREY NORMAL )],
-    [qw(DBLUE DMAGENTA NORMAL)],
-    [qw(DBLUE DRED NORMAL )],
-    [qw(DBLUE BLACK NORMAL)],
-    [qw(DGREEN DYELLOW NORMAL )],
-    [qw(DYELLOW BLACK NORMAL)],
-    [qw(DMAGENTA BLACK NORMAL)],
-    [qw(DCYAN DBLUE NORMAL)],
-    # for dark backgrounds
-    [qw(WHITE GREY NORMAL)],
-    [qw(GREY WHITE NORMAL)],
-    [qw(CYAN GREY NORMAL )],
-    [qw(GREEN WHITE NORMAL )],
-    [qw(GREEN YELLOW NORMAL )],
-    [qw(YELLOW WHITE NORMAL )],
-    [qw(MAGENTA CYAN NORMAL )],
-    [qw(MAGENTA YELLOW NORMAL)],
-    [qw(RED CYAN NORMAL)],
-    [qw(RED WHITE NORMAL )],
-    [qw(BLUE WHITE NORMAL)],
-    # miscellaneous
-    [qw(RED BLUE NORMAL )],
-    [qw(RED DBLUE NORMAL)],
-    [qw(BLACK BLUE NORMAL)],
-    [qw(BLACK DBLUE NORMAL)],
-    [qw(NORMAL BLUE NORMAL)],
-    [qw(BLUE MAGENTA NORMAL)],
-    [qw(DBLUE MAGENTA NORMAL)],
-    [qw(BLACK MAGENTA NORMAL)],
-    [qw(MAGENTA BLUE NORMAL)],
-    [qw(MAGENTA DBLUE NORMAL)],
-    );
-    if ($type eq 'count' ){
-        return scalar @color_schemes;
-    }
-    if ($type eq 'full' ){
-        return @color_schemes;
-    }
-    else {
-        return @{$color_schemes[$type]};
-        # print Dumper $color_schemes[$scheme_nu];
-    }
-    eval $end if $b_log;
+	my ($type) = @_;
+	eval $start if $b_log;
+	my @color_schemes = (
+	[qw(EMPTY EMPTY EMPTY)],
+	[qw(NORMAL NORMAL NORMAL)],
+	# for dark OR light backgrounds
+	[qw(BLUE NORMAL NORMAL)],
+	[qw(BLUE RED NORMAL)],
+	[qw(CYAN BLUE NORMAL)],
+	[qw(DCYAN NORMAL NORMAL)],
+	[qw(DCYAN BLUE NORMAL)],
+	[qw(DGREEN NORMAL NORMAL)],
+	[qw(DYELLOW NORMAL NORMAL)],
+	[qw(GREEN DGREEN NORMAL)],
+	[qw(GREEN NORMAL NORMAL)],
+	[qw(MAGENTA NORMAL NORMAL)],
+	[qw(RED NORMAL NORMAL)],
+	# for light backgrounds
+	[qw(BLACK DGREY NORMAL)],
+	[qw(DBLUE DGREY NORMAL)],
+	[qw(DBLUE DMAGENTA NORMAL)],
+	[qw(DBLUE DRED NORMAL)],
+	[qw(DBLUE BLACK NORMAL)],
+	[qw(DGREEN DYELLOW NORMAL)],
+	[qw(DYELLOW BLACK NORMAL)],
+	[qw(DMAGENTA BLACK NORMAL)],
+	[qw(DCYAN DBLUE NORMAL)],
+	# for dark backgrounds
+	[qw(WHITE GREY NORMAL)],
+	[qw(GREY WHITE NORMAL)],
+	[qw(CYAN GREY NORMAL)],
+	[qw(GREEN WHITE NORMAL)],
+	[qw(GREEN YELLOW NORMAL)],
+	[qw(YELLOW WHITE NORMAL)],
+	[qw(MAGENTA CYAN NORMAL)],
+	[qw(MAGENTA YELLOW NORMAL)],
+	[qw(RED CYAN NORMAL)],
+	[qw(RED WHITE NORMAL)],
+	[qw(BLUE WHITE NORMAL)],
+	# miscellaneous
+	[qw(RED BLUE NORMAL)],
+	[qw(RED DBLUE NORMAL)],
+	[qw(BLACK BLUE NORMAL)],
+	[qw(BLACK DBLUE NORMAL)],
+	[qw(NORMAL BLUE NORMAL)],
+	[qw(BLUE MAGENTA NORMAL)],
+	[qw(DBLUE MAGENTA NORMAL)],
+	[qw(BLACK MAGENTA NORMAL)],
+	[qw(MAGENTA BLUE NORMAL)],
+	[qw(MAGENTA DBLUE NORMAL)],
+	);
+	eval $end if $b_log;
+	if ($type eq 'count'){
+		return scalar @color_schemes;
+	}
+	if ($type eq 'full'){
+		return @color_schemes;
+	}
+	else {
+		return @{$color_schemes[$type]};
+		# print Dumper $color_schemes[$scheme_nu];
+	}
 }
 
 sub set_color_scheme {
-    eval $start if $b_log;
-    my ($scheme) = @_;
-    $colors{'scheme'} = $scheme;
-    my $index = ( $b_irc ) ? 1 : 0; # defaults to non irc
-    
-    # NOTE: qw(...) kills the escape, it is NOT the same as using 
-    # Literal "..", ".." despite docs saying it is.
-    my %color_palette = (
-    'EMPTY' => [ '', '' ],
-    'DGREY' => [ "\e[1;30m", "\x0314" ],
-    'BLACK' => [ "\e[0;30m", "\x0301" ],
-    'RED' => [ "\e[1;31m", "\x0304" ],
-    'DRED' => [ "\e[0;31m", "\x0305" ],
-    'GREEN' => [ "\e[1;32m", "\x0309" ],
-    'DGREEN' => [ "\e[0;32m", "\x0303" ],
-    'YELLOW' => [ "\e[1;33m", "\x0308" ],
-    'DYELLOW' => [ "\e[0;33m", "\x0307" ],
-    'BLUE' => [ "\e[1;34m", "\x0312" ],
-    'DBLUE' => [ "\e[0;34m", "\x0302" ],
-    'MAGENTA' => [ "\e[1;35m", "\x0313" ],
-    'DMAGENTA' => [ "\e[0;35m", "\x0306" ],
-    'CYAN' => [ "\e[1;36m", "\x0311" ],
-    'DCYAN' => [ "\e[0;36m", "\x0310" ],
-    'WHITE' => [ "\e[1;37m", "\x0300" ],
-    'GREY' => [ "\e[0;37m", "\x0315" ],
-    'NORMAL' => [ "\e[0m", "\x03" ],
-    );
-    my @scheme = get_color_scheme($colors{'scheme'});
-    $colors{'c1'} = $color_palette{$scheme[0]}[$index];
-    $colors{'c2'} = $color_palette{$scheme[1]}[$index];
-    $colors{'cn'} = $color_palette{$scheme[2]}[$index];
-    # print Dumper \@scheme;
-    # print "$colors{'c1'}here$colors{'c2'} we are!$colors{'cn'}\n";
-    eval $end if $b_log;
+	eval $start if $b_log;
+	my ($scheme) = @_;
+	$colors{'scheme'} = $scheme;
+	my $index = ($b_irc) ? 1 : 0; # defaults to non irc
+	
+	# NOTE: qw(...) kills the escape, it is NOT the same as using 
+	# Literal "..", ".." despite docs saying it is.
+	my %color_palette = (
+	'EMPTY' => [ '', '' ],
+	'DGREY' => [ "\e[1;30m", "\x0314" ],
+	'BLACK' => [ "\e[0;30m", "\x0301" ],
+	'RED' => [ "\e[1;31m", "\x0304" ],
+	'DRED' => [ "\e[0;31m", "\x0305" ],
+	'GREEN' => [ "\e[1;32m", "\x0309" ],
+	'DGREEN' => [ "\e[0;32m", "\x0303" ],
+	'YELLOW' => [ "\e[1;33m", "\x0308" ],
+	'DYELLOW' => [ "\e[0;33m", "\x0307" ],
+	'BLUE' => [ "\e[1;34m", "\x0312" ],
+	'DBLUE' => [ "\e[0;34m", "\x0302" ],
+	'MAGENTA' => [ "\e[1;35m", "\x0313" ],
+	'DMAGENTA' => [ "\e[0;35m", "\x0306" ],
+	'CYAN' => [ "\e[1;36m", "\x0311" ],
+	'DCYAN' => [ "\e[0;36m", "\x0310" ],
+	'WHITE' => [ "\e[1;37m", "\x0300" ],
+	'GREY' => [ "\e[0;37m", "\x0315" ],
+	'NORMAL' => [ "\e[0m", "\x03" ],
+	);
+	my @scheme = get_color_scheme($colors{'scheme'});
+	$colors{'c1'} = $color_palette{$scheme[0]}->[$index];
+	$colors{'c2'} = $color_palette{$scheme[1]}->[$index];
+	$colors{'cn'} = $color_palette{$scheme[2]}->[$index];
+	# print Dumper \@scheme;
+	# print "$colors{'c1'}here$colors{'c2'} we are!$colors{'cn'}\n";
+	eval $end if $b_log;
 }
 
 sub set_colors {
-    eval $start if $b_log;
-    # it's already been set with -c 0-43
-    if ( exists $colors{'c1'} ){
-        return 1;
-    }
-    # This let's user pick their color scheme. For IRC, only shows the color schemes, 
-    # no interactive. The override value only will be placed in user config files. 
-    # /etc/inxi.conf can also override
-    if (exists $colors{'selector'}){
-        my $ob_selector = SelectColors->new($colors{'selector'});
-        $ob_selector->select_schema();
-        return 1;
-    }
-    # set the default, then override as required
-    my $color_scheme = $colors{'default'};
-    # these are set in user configs
-    if (defined $colors{'global'}){
-        $color_scheme = $colors{'global'};
-    }
-    else {
-        if ( $b_irc ){
-            if (defined $colors{'irc-virt-term'} && $b_display && $client{'console-irc'}){
-                $color_scheme = $colors{'irc-virt-term'};
-            }
-            elsif (defined $colors{'irc-console'} && !$b_display){
-                $color_scheme = $colors{'irc-console'};
-            }
-            elsif ( defined $colors{'irc-gui'}) {
-                $color_scheme = $colors{'irc-gui'};
-            }
-        }
-        else {
-            if (defined $colors{'console'} && !$b_display){
-                $color_scheme = $colors{'console'};
-            }
-            elsif (defined $colors{'virt-term'}){
-                $color_scheme = $colors{'virt-term'};
-            }
-        }
-    }
-    # force 0 for | or > output, all others prints to irc or screen
-    if (!$b_irc && ! -t STDOUT ){
-        $color_scheme = 0;
-    }
-    set_color_scheme($color_scheme);
-    eval $end if $b_log;
+	eval $start if $b_log;
+	# it's already been set with -c 0-43
+	if (exists $colors{'c1'}){
+		return 1;
+	}
+	# This let's user pick their color scheme. For IRC, only shows the color 
+	# schemes, no interactive. The override value only will be placed in user 
+	# config files. /etc/inxi.conf can also override
+	if (exists $colors{'selector'}){
+		my $ob_selector = SelectColors->new($colors{'selector'});
+		$ob_selector->select_schema();
+		return 1;
+	}
+	# set the default, then override as required
+	my $color_scheme = $colors{'default'};
+	# these are set in user configs
+	if (defined $colors{'global'}){
+		$color_scheme = $colors{'global'};
+	}
+	else {
+		if ($b_irc){
+			if (defined $colors{'irc-virt-term'} && $b_display && $client{'console-irc'}){
+				$color_scheme = $colors{'irc-virt-term'};
+			}
+			elsif (defined $colors{'irc-console'} && !$b_display){
+				$color_scheme = $colors{'irc-console'};
+			}
+			elsif (defined $colors{'irc-gui'}){
+				$color_scheme = $colors{'irc-gui'};
+			}
+		}
+		else {
+			if (defined $colors{'console'} && !$b_display){
+				$color_scheme = $colors{'console'};
+			}
+			elsif (defined $colors{'virt-term'}){
+				$color_scheme = $colors{'virt-term'};
+			}
+		}
+	}
+	# force 0 for | or > output, all others prints to irc or screen
+	if (!$b_irc && ! -t STDOUT){
+		$color_scheme = 0;
+	}
+	set_color_scheme($color_scheme);
+	eval $end if $b_log;
 }
 
 ## SelectColors
 {
 package SelectColors;
-
-# use warnings;
-# use strict;
-# use diagnostics;
-# use 5.008;
-
-my (@data,@rows,%configs,%status);
+my (@data,%configs,%status);
 my ($type,$w_fh);
 my $safe_color_count = 12; # null/normal + default color group
 my $count = 0;
-
 # args: 1 - type
 sub new {
-    my $class = shift;
-    ($type) = @_;
-    my $self = {};
-    return bless $self, $class;
+	my $class = shift;
+	($type) = @_;
+	my $self = {};
+	return bless $self, $class;
 }
 sub select_schema {
-    eval $start if $b_log;
-    assign_selectors();
-    main::set_color_scheme(0);
-    set_status();
-    start_selector();
-    create_color_selections();
-    if (! $b_irc ){
-        main::check_config_file();
-        get_selection();
-    }
-    else {
-        print_irc_message();
-    }
-    eval $end if $b_log;
+	eval $start if $b_log;
+	assign_selectors();
+	main::set_color_scheme(0);
+	set_status();
+	start_selector();
+	create_color_selections();
+	if (!$b_irc){
+		Configs::check_file();
+		get_selection();
+	}
+	else {
+		print_irc_message();
+	}
+	eval $end if $b_log;
 }
 
 sub set_status {
-    $status{'console'} = (defined $colors{'console'}) ? "Set: $colors{'console'}" : 'Not Set';
-    $status{'virt-term'} = (defined $colors{'virt-term'}) ? "Set: $colors{'virt-term'}" : 'Not Set';
-    $status{'irc-console'} = (defined $colors{'irc-console'}) ? "Set: $colors{'irc-console'}" : 'Not Set';
-    $status{'irc-gui'} = (defined $colors{'irc-gui'}) ? "Set: $colors{'irc-gui'}" : 'Not Set';
-    $status{'irc-virt-term'} = (defined $colors{'irc-virt-term'}) ? "Set: $colors{'irc-virt-term'}" : 'Not Set';
-    $status{'global'} = (defined $colors{'global'}) ? "Set: $colors{'global'}" : 'Not Set';
+	$status{'console'} = (defined $colors{'console'}) ? "Set: $colors{'console'}" : 'Not Set';
+	$status{'virt-term'} = (defined $colors{'virt-term'}) ? "Set: $colors{'virt-term'}" : 'Not Set';
+	$status{'irc-console'} = (defined $colors{'irc-console'}) ? "Set: $colors{'irc-console'}" : 'Not Set';
+	$status{'irc-gui'} = (defined $colors{'irc-gui'}) ? "Set: $colors{'irc-gui'}" : 'Not Set';
+	$status{'irc-virt-term'} = (defined $colors{'irc-virt-term'}) ? "Set: $colors{'irc-virt-term'}" : 'Not Set';
+	$status{'global'} = (defined $colors{'global'}) ? "Set: $colors{'global'}" : 'Not Set';
 }
 
 sub assign_selectors {
-    if ($type == 94){
-        $configs{'variable'} = 'CONSOLE_COLOR_SCHEME';
-        $configs{'selection'} = 'console';
-    }
-    elsif ($type == 95){
-        $configs{'variable'} = 'VIRT_TERM_COLOR_SCHEME';
-        $configs{'selection'} = 'virt-term';
-    }
-    elsif ($type == 96){
-        $configs{'variable'} = 'IRC_COLOR_SCHEME';
-        $configs{'selection'} = 'irc-gui';
-    }
-    elsif ($type == 97){
-        $configs{'variable'} = 'IRC_X_TERM_COLOR_SCHEME';
-        $configs{'selection'} = 'irc-virt-term';
-    }
-    elsif ($type == 98){
-        $configs{'variable'} = 'IRC_CONS_COLOR_SCHEME';
-        $configs{'selection'} = 'irc-console';
-    }
-    elsif ($type == 99){
-        $configs{'variable'} = 'GLOBAL_COLOR_SCHEME';
-        $configs{'selection'} = 'global';
-    }
+	if ($type == 94){
+		$configs{'variable'} = 'CONSOLE_COLOR_SCHEME';
+		$configs{'selection'} = 'console';
+	}
+	elsif ($type == 95){
+		$configs{'variable'} = 'VIRT_TERM_COLOR_SCHEME';
+		$configs{'selection'} = 'virt-term';
+	}
+	elsif ($type == 96){
+		$configs{'variable'} = 'IRC_COLOR_SCHEME';
+		$configs{'selection'} = 'irc-gui';
+	}
+	elsif ($type == 97){
+		$configs{'variable'} = 'IRC_X_TERM_COLOR_SCHEME';
+		$configs{'selection'} = 'irc-virt-term';
+	}
+	elsif ($type == 98){
+		$configs{'variable'} = 'IRC_CONS_COLOR_SCHEME';
+		$configs{'selection'} = 'irc-console';
+	}
+	elsif ($type == 99){
+		$configs{'variable'} = 'GLOBAL_COLOR_SCHEME';
+		$configs{'selection'} = 'global';
+	}
 }
 sub start_selector {
-    my $whoami = getpwuid($<) || "unknown???";
-    if ( ! $b_irc ){
-        @data = (
-        [ 0, '', '', "Welcome to $self_name! Please select the default 
-        $configs{'selection'} color scheme."],
-        );
-    }
-    @rows = (
-    [ 0, '', '', "Because there is no way to know your $configs{'selection'}
-    foreground/background colors, you can set your color preferences from 
-    color scheme option list below:"],
-    [ 0, '', '', "0 is no colors; 1 is neutral."],
-    [ 0, '', '', "After these, there are 4 sets:"],
-    [ 0, '', '', "1-dark^or^light^backgrounds; 2-light^backgrounds; 
-    3-dark^backgrounds; 4-miscellaneous"],
-    [ 0, '', '', ""],
-    );
-    push @data, @rows;
-    if ( ! $b_irc ){
-        @rows = (
-        [ 0, '', '', "Please note that this will set the $configs{'selection'} 
-        preferences only for user: $whoami"],
-        );
-        push @data, @rows;
-    }
-    @rows = (
-    [ 0, '', '', "$line1"],
-    );
-    push @data, @rows;
-    main::print_basic(@data); 
-    @data = ();
+	my $whoami = getpwuid($<) || "unknown???";
+	if (!$b_irc){
+		@data = (
+		[ 0, '', '', "Welcome to $self_name! Please select the default 
+		$configs{'selection'} color scheme."],
+		);
+	}
+	push(@data, 
+	[ 0, '', '', "Because there is no way to know your $configs{'selection'}
+	foreground/background colors, you can set your color preferences from 
+	color scheme option list below:"],
+	[ 0, '', '', "0 is no colors; 1 is neutral."],
+	[ 0, '', '', "After these, there are 4 sets:"],
+	[ 0, '', '', "1-dark^or^light^backgrounds; 2-light^backgrounds; 
+	3-dark^backgrounds; 4-miscellaneous"],
+	[ 0, '', '', ""],
+	);
+	if (!$b_irc){
+		push(@data, 
+		[ 0, '', '', "Please note that this will set the $configs{'selection'} 
+		preferences only for user: $whoami"],
+		);
+	}
+	push(@data, 
+	[ 0, '', '', "$line1"],
+	);
+	main::print_basic(\@data); 
+	@data = ();
 }
 sub create_color_selections {
-    my $spacer = '^^'; # printer removes double spaces, but replaces ^ with ' '
-    $count = ( main::get_color_scheme('count') - 1 );
-    for my $i (0 .. $count){
-        if ($i > 9){
-            $spacer = '^';
-        }
-        if ($configs{'selection'} =~ /^(global|irc-gui|irc-console|irc-virt-term)$/ && $i > $safe_color_count ){
-            last;
-        }
-        main::set_color_scheme($i);
-        @rows = (
-        [0, '', '', "$i)$spacer$colors{'c1'}Card:$colors{'c2'}^nVidia^GT218 
-        $colors{'c1'}Display^Server$colors{'c2'}^x11^(X.Org^1.7.7)$colors{'cn'}"],
-        );
-        push @data, @rows;
-    }
-    main::print_basic(@data); 
-    @data = ();
-    main::set_color_scheme(0);
+	my $spacer = '^^'; # printer removes double spaces, but replaces ^ with ' '
+	$count = (main::get_color_scheme('count') - 1);
+	foreach my $i (0 .. $count){
+		if ($i > 9){
+			$spacer = '^';
+		}
+		if ($configs{'selection'} =~ /^(global|irc-gui|irc-console|irc-virt-term)$/ && $i > $safe_color_count){
+			last;
+		}
+		main::set_color_scheme($i);
+		push(@data, 
+		[0, '', '', "$i)$spacer$colors{'c1'}Card:$colors{'c2'}^nVidia^GT218 
+		$colors{'c1'}Display^Server$colors{'c2'}^x11^(X.Org^1.7.7)$colors{'cn'}"],
+		);
+	}
+	main::print_basic(\@data); 
+	@data = ();
+	main::set_color_scheme(0);
 }
 sub get_selection {
-    my $number = $count + 1;
-    @data = (
-    [0, '', '', ($number++) . ")^Remove all color settings. Restore $self_name default."],
-    [0, '', '', ($number++) . ")^Continue, no changes or config file setting."],
-    [0, '', '', ($number++) . ")^Exit, use another terminal, or set manually."],
-    [0, '', '', "$line1"],
-    [0, '', '', "Simply type the number for the color scheme that looks best to your 
-    eyes for your $configs{'selection'} settings and hit <ENTER>. NOTE: You can bring this 
-    option list up by starting $self_name with option: -c plus one of these numbers:"],
-    [0, '', '', "94^-^console,^not^in^desktop^-^$status{'console'}"],
-    [0, '', '', "95^-^terminal,^desktop^-^$status{'virt-term'}"],
-    [0, '', '', "96^-^irc,^gui,^desktop^-^$status{'irc-gui'}"],
-    [0, '', '', "97^-^irc,^desktop,^in^terminal^-^$status{'irc-virt-term'}"],
-    [0, '', '', "98^-^irc,^not^in^desktop^-^$status{'irc-console'}"],
-    [0, '', '', "99^-^global^-^$status{'global'}"],
-    [0, '', '',  ""],
-    [0, '', '', "Your selection(s) will be stored here: $user_config_file"],
-    [0, '', '', "Global overrides all individual color schemes. Individual 
-    schemes remove the global setting."],
-    [0, '', '', "$line1"],
-    );
-    main::print_basic(@data); 
-    @data = ();
-    my $response = <STDIN>;
-    chomp $response;
-    if (!main::is_int($response) || $response > ($count + 3) ){
-        @data = (
-        [0, '', '', "Error - Invalid Selection. You entered this: $response. Hit <ENTER> to continue."],
-        [0, '', '',  "$line1"],
-        );
-        main::print_basic(@data); 
-        my $response = <STDIN>;
-        start_selector();
-        create_color_selections();
-        get_selection();
-    }
-    else {
-        process_selection($response);
-    }
+	my $number = $count + 1;
+	@data = (
+	[0, '', '', ($number++) . ")^Remove all color settings. Restore $self_name default."],
+	[0, '', '', ($number++) . ")^Continue, no changes or config file setting."],
+	[0, '', '', ($number++) . ")^Exit, use another terminal, or set manually."],
+	[0, '', '', "$line1"],
+	[0, '', '', "Simply type the number for the color scheme that looks best to your 
+	eyes for your $configs{'selection'} settings and hit <ENTER>. NOTE: You can bring this 
+	option list up by starting $self_name with option: -c plus one of these numbers:"],
+	[0, '', '', "94^-^console,^not^in^desktop^-^$status{'console'}"],
+	[0, '', '', "95^-^terminal,^desktop^-^$status{'virt-term'}"],
+	[0, '', '', "96^-^irc,^gui,^desktop^-^$status{'irc-gui'}"],
+	[0, '', '', "97^-^irc,^desktop,^in^terminal^-^$status{'irc-virt-term'}"],
+	[0, '', '', "98^-^irc,^not^in^desktop^-^$status{'irc-console'}"],
+	[0, '', '', "99^-^global^-^$status{'global'}"],
+	[0, '', '',  ""],
+	[0, '', '', "Your selection(s) will be stored here: $user_config_file"],
+	[0, '', '', "Global overrides all individual color schemes. Individual 
+	schemes remove the global setting."],
+	[0, '', '', "$line1"],
+	);
+	main::print_basic(\@data); 
+	@data = ();
+	my $response = <STDIN>;
+	chomp($response);
+	if (!main::is_int($response) || $response > ($count + 3)){
+		@data = (
+		[0, '', '', "Error - Invalid Selection. You entered this: $response. Hit <ENTER> to continue."],
+		[0, '', '',  "$line1"],
+		);
+		main::print_basic(\@data); 
+		my $response = <STDIN>;
+		start_selector();
+		create_color_selections();
+		get_selection();
+	}
+	else {
+		process_selection($response);
+	}
+	if ($b_pledge){
+		@pledges = grep {$_ ne 'getpw'} @pledges;
+		OpenBSD::Pledge::pledge(@pledges);
+	}
 }
 sub process_selection {
-    my $response = shift;
-    if ($response == ($count + 3) ){
-        @data = ([0, '', '', "Ok, exiting $self_name now. You can set the colors later."],);
-        main::print_basic(@data); 
-        exit 0;
-    }
-    elsif ($response == ($count + 2)){
-        @data = (
-        [0, '', '', "Ok, continuing $self_name unchanged."],
-        [0, '', '',  "$line1"],
-        );
-        main::print_basic(@data); 
-        if ( defined $colors{'console'} && !$b_display ){
-            main::set_color_scheme($colors{'console'});
-        }
-        if ( defined $colors{'virt-term'} ){
-            main::set_color_scheme($colors{'virt-term'});
-        }
-        else {
-            main::set_color_scheme($colors{'default'});
-        }
-    }
-    elsif ($response == ($count + 1)){
-        @data = (
-        [0, '', '', "Removing all color settings from config file now..."],
-        [0, '', '',  "$line1"],
-        );
-        main::print_basic(@data); 
-        delete_all_config_colors();
-        main::set_color_scheme($colors{'default'});
-    }
-    else {
-        main::set_color_scheme($response);
-        @data = (
-        [0, '', '', "Updating config file for $configs{'selection'} color scheme now..."],
-        [0, '', '',  "$line1"],
-        );
-        main::print_basic(@data); 
-        if ($configs{'selection'} eq 'global'){
-            delete_all_colors();
-        }
-        else {
-            delete_global_color();
-        }
-        set_config_color_scheme($response);
-    }
+	my $response = shift;
+	if ($response == ($count + 3)){
+		@data = (
+		[0, '', '', "Ok, exiting $self_name now. You can set the colors later."],
+		);
+		main::print_basic(\@data); 
+		exit 0;
+	}
+	elsif ($response == ($count + 2)){
+		@data = (
+		[0, '', '', "Ok, continuing $self_name unchanged."],
+		[0, '', '',  "$line1"],
+		);
+		main::print_basic(\@data); 
+		if (defined $colors{'console'} && !$b_display){
+			main::set_color_scheme($colors{'console'});
+		}
+		if (defined $colors{'virt-term'}){
+			main::set_color_scheme($colors{'virt-term'});
+		}
+		else {
+			main::set_color_scheme($colors{'default'});
+		}
+	}
+	elsif ($response == ($count + 1)){
+		@data = (
+		[0, '', '', "Removing all color settings from config file now..."],
+		[0, '', '',  "$line1"],
+		);
+		main::print_basic(\@data); 
+		delete_all_config_colors();
+		main::set_color_scheme($colors{'default'});
+	}
+	else {
+		main::set_color_scheme($response);
+		@data = (
+		[0, '', '', "Updating config file for $configs{'selection'} color scheme now..."],
+		[0, '', '',  "$line1"],
+		);
+		main::print_basic(\@data); 
+		if ($configs{'selection'} eq 'global'){
+			delete_all_colors();
+		}
+		else {
+			delete_global_color();
+		}
+		set_config_color_scheme($response);
+	}
 }
 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 ) { 
-        if ( $_ !~ /^(CONSOLE_COLOR_SCHEME|GLOBAL_COLOR_SCHEME|IRC_COLOR_SCHEME|IRC_CONS_COLOR_SCHEME|IRC_X_TERM_COLOR_SCHEME|VIRT_TERM_COLOR_SCHEME)/){
-            print {$w_fh} "$_"; 
-        }
-    } 
-    close $w_fh;
+	my @file_lines = main::reader($user_config_file);
+	open($w_fh, '>', $user_config_file) or main::error_handler('open', $user_config_file, $!);
+	foreach (@file_lines){ 
+		if ($_ !~ /^(CONSOLE_COLOR_SCHEME|GLOBAL_COLOR_SCHEME|IRC_COLOR_SCHEME|IRC_CONS_COLOR_SCHEME|IRC_X_TERM_COLOR_SCHEME|VIRT_TERM_COLOR_SCHEME)/){
+			print {$w_fh} "$_"; 
+		}
+	} 
+	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;
+	my @file_lines = main::reader($user_config_file);
+	open($w_fh, '>', $user_config_file) or main::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 );
-    my $b_found = 0;
-    open( $w_fh, '>', $user_config_file ) or error_handler('open', $user_config_file, $!);
-    foreach ( @file_lines ) { 
-        if ( $_ =~ /^$configs{'variable'}/ ){
-            $_ = "$configs{'variable'}=$value";
-            $b_found = 1;
-        }
-        print $w_fh "$_\n";
-    }
-    if (! $b_found ){
-        print $w_fh "$configs{'variable'}=$value\n";
-    }
-    close $w_fh;
+	my $value = shift;
+	my @file_lines = main::reader($user_config_file);
+	my $b_found = 0;
+	open($w_fh, '>', $user_config_file) or main::error_handler('open', $user_config_file, $!);
+	foreach (@file_lines){ 
+		if ($_ =~ /^$configs{'variable'}/){
+			$_ = "$configs{'variable'}=$value";
+			$b_found = 1;
+		}
+		print $w_fh "$_\n";
+	}
+	if (!$b_found){
+		print $w_fh "$configs{'variable'}=$value\n";
+	}
+	close $w_fh;
 }
 
 sub print_irc_message {
-    @data = (
-    [ 0, '', '', "$line1"],
-    [ 0, '', '', "After finding the scheme number you like, simply run this again
-    in a terminal to set the configuration data file for your irc client. You can 
-    set color schemes for the following: start inxi with -c plus:"],
-    [ 0, '', '', "94 (console,^not^in^desktop^-^$status{'console'})"],
-    [ 0, '', '', "95 (terminal, desktop^-^$status{'virt-term'})"],
-    [ 0, '', '', "96 (irc,^gui,^desktop^-^$status{'irc-gui'})"],
-    [ 0, '', '', "97 (irc,^desktop,^in terminal^-^$status{'irc-virt-term'})"],
-    [ 0, '', '', "98 (irc,^not^in^desktop^-^$status{'irc-console'})"],
-    [ 0, '', '', "99 (global^-^$status{'global'})"]
-    );
-    main::print_basic(@data); 
-    exit 0;
+	@data = (
+	[ 0, '', '', "$line1"],
+	[ 0, '', '', "After finding the scheme number you like, simply run this again
+	in a terminal to set the configuration data file for your irc client. You can 
+	set color schemes for the following: start inxi with -c plus:"],
+	[ 0, '', '', "94 (console,^not^in^desktop^-^$status{'console'})"],
+	[ 0, '', '', "95 (terminal, desktop^-^$status{'virt-term'})"],
+	[ 0, '', '', "96 (irc,^gui,^desktop^-^$status{'irc-gui'})"],
+	[ 0, '', '', "97 (irc,^desktop,^in terminal^-^$status{'irc-virt-term'})"],
+	[ 0, '', '', "98 (irc,^not^in^desktop^-^$status{'irc-console'})"],
+	[ 0, '', '', "99 (global^-^$status{'global'})"]
+	);
+	main::print_basic(\@data); 
+	exit 0;
 }
 
 }
@@ -1018,100 +1134,158 @@ sub print_irc_message {
 #### CONFIGS
 #### -------------------------------------------------------------------
 
-sub check_config_file {
-    $user_config_file = "$user_config_dir/$self_name.conf";
-    if ( ! -f $user_config_file ){
-        open( my $fh, '>', $user_config_file ) or error_handler('create', $user_config_file, $!);
-    }
-}
-
-sub get_configs {
-    my (@configs) = @_;
-    my ($key, $val,@config_files);
-    if (!@configs){
-        @config_files = (
-        qq(/etc/$self_name.conf), 
-        qq($user_config_dir/$self_name.conf)
-        );
-    }
-    else {
-        @config_files = (@configs);
-    }
-    # Config files should be passed in an array as a param to this function.
-    # Default intended use: global @CONFIGS;
-    foreach (@config_files) {
-        next unless open (my $fh, '<', "$_");
-        while (<$fh>) {
-            chomp;
-            s/#.*//;
-            s/^\s+//;
-            s/\s+$//;
-            s/'|"//g;
-            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";
-        }
-        close $fh;
-    }
-}
-
-# note: someone managed to make a config file with corrupted values, so check int 
-# explicitly, don't assume it was done correctly.
+## Configs
+# public: set() check_file()
+{
+package Configs;
+sub set {
+	my ($configs) = @_;
+	my ($key, $val,@config_files);
+	if (!$configs){
+		@config_files = (
+		qq(/etc/$self_name.conf), 
+		qq($user_config_dir/$self_name.conf)
+		);
+	}
+	else {
+		@config_files = @$configs;
+	}
+	# Config files should be passed in an array as a param to this function.
+	# Default intended use: global @CONFIGS;
+	foreach (@config_files){
+		next unless open(my $fh, '<', "$_");
+		while (<$fh>){
+			chomp;
+			s/#.*//;
+			s/^\s+//;
+			s/\s+$//;
+			s/'|"//g;
+			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);
+			process_item($key,$val);
+			# print "f: $file key: $key val: $val\n";
+		}
+		close $fh;
+	}
+}
+# 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 = $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
-            # desired downloader.
-            $val = set_perl_downloader($val);
-            %dl = ('dl' => $val, $val => 1);
-        }}
-    elsif ($key eq 'FILTER_STRING') {$filter_string = $val}
-    elsif ($key eq 'LANGUAGE') {$language = $val if $val =~ /^(en)$/}
-    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 'PARTITION_SORT') {$show{'partition-sort'} = $val if ($val =~ /^(dev-base|fs|id|label|percent-used|size|uuid|used)$/) }
-    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 'USB_SYS') {$b_usb_sys = $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)$/){
-            my %units = ('c'=>'m','f'=>'i','cf'=>'mi','fc'=>'im');
-            $val = $units{$val} if defined $units{$val};
-            $weather_unit = $val;
-        }
-    }
-    # layout
-    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 'SEP2_IRC') {$sep{'s2-irc'} = $val}
-    elsif ($key eq 'SEP2_CONSOLE') {$sep{'s2-console'} = $val}
-    # size
-    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";
+sub process_item {
+	my ($key,$val) = @_;
+	if ($key eq 'ALLOW_UPDATE' || $key eq 'B_ALLOW_UPDATE'){
+		$use{'update'} = $val if main::is_int($val)}
+	elsif ($key eq 'ALLOW_WEATHER' || $key eq 'B_ALLOW_WEATHER'){
+		$use{'weather'} = $val if main::is_int($val)}
+	elsif ($key eq 'CPU_SLEEP'){
+		$cpu_sleep = $val if main::is_numeric($val)}
+	elsif ($key eq 'DL_TIMEOUT'){
+		$dl_timeout = $val if main::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
+			# desired downloader.
+			$val = main::set_perl_downloader($val);
+			%dl = ('dl' => $val, $val => 1);
+		}}
+	elsif ($key eq 'FILTER_STRING'){
+		$filter_string = $val}
+	elsif ($key eq 'LANGUAGE'){
+		$language = $val if $val =~ /^(en)$/}
+	elsif ($key eq 'LIMIT'){
+		$limit = $val if main::is_int($val)}
+	elsif ($key eq 'OUTPUT_TYPE'){
+		$output_type = $val if $val =~ /^(json|screen|xml)$/}
+	elsif ($key eq 'NO_DIG'){
+		$force{'no-dig'} = $val if main::is_int($val)}
+	elsif ($key eq 'NO_DOAS'){
+		$force{'no-doas'} = $val if main::is_int($val)}
+	elsif ($key eq 'NO_HTML_WAN'){
+		$force{'no-html-wan'} = $val if main::is_int($val)}
+	elsif ($key eq 'NO_SUDO'){
+		$force{'no-sudo'} = $val if main::is_int($val)}
+	elsif ($key eq 'PARTITION_SORT'){
+		if ($val =~ /^(dev-base|fs|id|label|percent-used|size|uuid|used)$/){
+			$show{'partition-sort'} = $val;
+		}}
+	elsif ($key eq 'PS_COUNT'){
+		$ps_count = $val if main::is_int($val) }
+	elsif ($key eq 'SENSORS_CPU_NO'){
+		$sensors_cpu_nu = $val if main::is_int($val)}
+	elsif ($key eq 'SENSORS_EXCLUDE'){
+		@sensors_exclude = split(/\s*,\s*/, $val) if $val}
+	elsif ($key eq 'SENSORS_USE'){
+		@sensors_use = split(/\s*,\s*/, $val) if $val}
+	elsif ($key eq 'SHOW_HOST' || $key eq 'B_SHOW_HOST'){
+		if (main::is_int($val)){
+			$show{'host'} = $val;
+			$show{'no-host'} = 1 if !$show{'host'};
+		}
+	}
+	elsif ($key eq 'USB_SYS'){
+		$force{'usb-sys'} = $val if main::is_int($val)}
+	elsif ($key eq 'WAN_IP_URL'){
+		if ($val =~ /^(ht|f)tp[s]?:\//i){
+			$wan_url = $val;
+			$force{'no-dig'} = 1;
+		}
+	}
+	elsif ($key eq 'WEATHER_SOURCE'){
+		$weather_source = $val if main::is_int($val)}
+	elsif ($key eq 'WEATHER_UNIT'){ 
+		$val = lc($val) if $val;
+		if ($val && $val =~ /^(c|f|cf|fc|i|m|im|mi)$/){
+			my %units = ('c'=>'m','f'=>'i','cf'=>'mi','fc'=>'im');
+			$val = $units{$val} if defined $units{$val};
+			$weather_unit = $val;
+		}
+	}
+	# layout
+	elsif ($key eq 'CONSOLE_COLOR_SCHEME'){
+		$colors{'console'} = $val if main::is_int($val)}
+	elsif ($key eq 'GLOBAL_COLOR_SCHEME'){
+		$colors{'global'} = $val if main::is_int($val)}
+	elsif ($key eq 'IRC_COLOR_SCHEME'){
+		$colors{'irc-gui'} = $val if main::is_int($val)}
+	elsif ($key eq 'IRC_CONS_COLOR_SCHEME'){
+		$colors{'irc-console'} = $val if main::is_int($val)}
+	elsif ($key eq 'IRC_X_TERM_COLOR_SCHEME'){
+		$colors{'irc-virt-term'} = $val if main::is_int($val)}
+	elsif ($key eq 'VIRT_TERM_COLOR_SCHEME'){
+		$colors{'virt-term'} = $val if main::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 'SEP2_IRC'){
+		$sep{'s2-irc'} = $val}
+	elsif ($key eq 'SEP2_CONSOLE'){
+		$sep{'s2-console'} = $val}
+	# size
+	elsif ($key eq 'COLS_MAX_CONSOLE'){
+		$size{'console'} = $val if main::is_int($val)}
+	elsif ($key eq 'COLS_MAX_IRC'){
+		$size{'irc'} = $val if main::is_int($val)}
+	elsif ($key eq 'COLS_MAX_NO_DISPLAY'){
+		$size{'no-display'} = $val if main::is_int($val)}
+	elsif ($key eq 'INDENT'){
+		$size{'indent'} = $val if main::is_int($val)}
+	elsif ($key eq 'WRAP_MAX' || $key eq 'INDENT_MIN'){
+		$size{'wrap-max'} = $val if main::is_int($val)}
+	#  print "mc: key: $key val: $val\n";
+	# print Dumper (keys %size) . "\n";
+}
+sub check_file {
+	$user_config_file = "$user_config_dir/$self_name.conf";
+	if (! -f $user_config_file){
+		open(my $fh, '>', $user_config_file) or 
+		 main::error_handler('create', $user_config_file, $!);
+	}
+}
 }
 
 #### -------------------------------------------------------------------
@@ -1122,40 +1296,40 @@ sub get_config_item {
 # as soon as possible # will have max 3 files, inxi.log, inxi.1.log, 
 # inxi.2.log
 sub begin_logging {
-    return 1 if $fh_l; # if we want to start logging for testing before options
-    my $log_file_2="$user_data_dir/$self_name.1.log";
-    my $log_file_3="$user_data_dir/$self_name.2.log";
-    my $data = '';
-    $end='main::log_data("fe", (caller(1))[3], "");';
-    $start='main::log_data("fs", (caller(1))[3], \@_);';
-    #$t3 = tv_interval ($t0, [gettimeofday]);
-    $t3 = eval 'Time::HiRes::tv_interval (\@t0, [Time::HiRes::gettimeofday()]);' if $b_hires;
-    #print Dumper $@;
-    my $now = strftime "%Y-%m-%d %H:%M:%S", localtime;
-    return if $debugger{'timers'};
-    # do the rotation if logfile exists
-    if ( -f $log_file ){
-        # copy if present second to third
-        if ( -f $log_file_2 ){
-            rename $log_file_2, $log_file_3 or error_handler('rename', "$log_file_2 -> $log_file_3", "$!");
-        }
-        # then copy initial to second
-        rename $log_file, $log_file_2 or error_handler('rename', "$log_file -> $log_file_2", "$!");
-    }
-    # now create the logfile
-    # print "Opening log file for reading: $log_file\n";
-    open $fh_l, '>', $log_file or error_handler(4, $log_file, "$!");
-    # and echo the start data
-    $data = $line2;
-    $data .= "START $self_name LOGGING:\n";
-    $data .= "NOTE: HiRes timer not available.\n" if !$b_hires;
-    $data .= "$now\n";
-    $data .= "Elapsed since start: $t3\n";
-    $data .= "n: $self_name v: $self_version p: $self_patch d: $self_date\n";
-    $data .= '@paths:' . joiner(\@paths, '::', 'unset') . "\n";
-    $data .= $line2;
-    
-    print $fh_l $data;
+	return 1 if $fh_l; # if we want to start logging for testing before options
+	my $log_file_2="$user_data_dir/$self_name.1.log";
+	my $log_file_3="$user_data_dir/$self_name.2.log";
+	my $data = '';
+	$end='main::log_data("fe", (caller(1))[3], "");';
+	$start='main::log_data("fs", (caller(1))[3], \@_);';
+	#$t3 = tv_interval ($t0, [gettimeofday]);
+	$t3 = eval 'Time::HiRes::tv_interval (\@t0, [Time::HiRes::gettimeofday()]);' if $b_hires;
+	# print Dumper $@;
+	my $now = strftime "%Y-%m-%d %H:%M:%S", localtime;
+	return if $debugger{'timers'};
+	# do the rotation if logfile exists
+	if (-f $log_file){
+		# copy if present second to third
+		if (-f $log_file_2){
+			rename $log_file_2, $log_file_3 or error_handler('rename', "$log_file_2 -> $log_file_3", "$!");
+		}
+		# then copy initial to second
+		rename $log_file, $log_file_2 or error_handler('rename', "$log_file -> $log_file_2", "$!");
+	}
+	# now create the logfile
+	# print "Opening log file for reading: $log_file\n";
+	open($fh_l, '>', $log_file) or error_handler(4, $log_file, "$!");
+	# and echo the start data
+	$data = $line2;
+	$data .= "START $self_name LOGGING:\n";
+	$data .= "NOTE: HiRes timer not available.\n" if !$b_hires;
+	$data .= "$now\n";
+	$data .= "Elapsed since start: $t3\n";
+	$data .= "n: $self_name v: $self_version p: $self_patch d: $self_date\n";
+	$data .= '@paths:' . joiner(\@paths, '::', 'unset') . "\n";
+	$data .= $line2;
+	
+	print $fh_l $data;
 }
 
 # NOTE: no logging available until get_parameters is run, since that's what 
@@ -1166,985 +1340,1120 @@ sub begin_logging {
 # arg: $one type (fs/fe/cat/dump/raw) or logged data; 
 # [$two is function name; [$three - function args]]
 sub log_data {
-    return if ! $b_log;
-    my ($one, $two, $three) = @_;
-    my ($args,$data,$timer) = ('','','');
-    my $spacer = '   ';
-    # print "1: $one 2: $two 3: $three\n";
-    if ($one eq 'fs') {
-        if (ref $three eq 'ARRAY'){
-            my @temp = @$three;
-            # print Data::Dumper::Dumper \@$three;
-            $args = "\n${spacer}Args: " . joiner($three, '; ', 'unset');
-        }
-        else {
-            $args = "\n${spacer}Args: None";
-        }
-        # $t1 = [gettimeofday];
-        #$t3 = tv_interval ($t0, [gettimeofday]);
-        $t3 = eval 'Time::HiRes::tv_interval(\@t0, [Time::HiRes::gettimeofday()])' if $b_hires;
-        #print Dumper $@;
-        $data = "Start: Function: $two$args\n${spacer}Elapsed: $t3\n";
-        $spacer='';
-        $timer = $data if $debugger{'timers'};
-    }
-    elsif ( $one eq 'fe') {
-        # print 'timer:', Time::HiRes::tv_interval(\@t0, [Time::HiRes::gettimeofday()]),"\n";
-        #$t3 = tv_interval ($t0, [gettimeofday]);
-        eval '$t3 = Time::HiRes::tv_interval(\@t0, [Time::HiRes::gettimeofday()])' if $b_hires;
-        #print Dumper $t3;
-        $data = "${spacer}Elapsed: $t3\nEnd: Function: $two\n";
-        $spacer='';
-        $timer = $data if $debugger{'timers'};
-    }
-    elsif ( $one eq 'cat') {
-        if ( $b_log_full ){
-            for my $file ($two){
-                my $contents = do { local( @ARGV, $/ ) = $file; <> }; # or: qx(cat $file)
-                $data = "$data${line3}Full file data: $file\n\n$contents\n$line3\n";
-            }
-            $spacer='';
-        }
-    }
-    elsif ($one eq 'cmd'){
-        $data = "Command: $two\n";
-        $data .= qx($two);
-    }
-    elsif ($one eq 'data'){
-        $data = "$two\n";
-    }
-    elsif ( $one eq 'dump') {
-        $data = "$two:\n";
-        if (ref $three eq 'HASH'){
-            $data .= Data::Dumper::Dumper \%$three;
-        }
-        elsif (ref $three eq 'ARRAY'){
-            # print Data::Dumper::Dumper \@$three;
-            $data .= Data::Dumper::Dumper \@$three;
-        }
-        else {
-            $data .= Data::Dumper::Dumper $three;
-        }
-        $data .= "\n";
-        # print $data;
-    }
-    elsif ( $one eq 'raw') {
-        if ( $b_log_full ){
-            $data = "\n${line3}Raw System Data:\n\n$two\n$line3";
-            $spacer='';
-        }
-    }
-    else {
-        $data = "$two\n";
-    }
-    if ($debugger{'timers'}){
-        print $timer if $timer;
-    }
-    #print "d: $data";
-    elsif ($data){
-        print $fh_l "$spacer$data";
-    }
+	return if !$b_log;
+	my ($one, $two, $three) = @_;
+	my ($args,$data,$timer) = ('','','');
+	my $spacer = '   ';
+	# print "1: $one 2: $two 3: $three\n";
+	if ($one eq 'fs'){
+		if (ref $three eq 'ARRAY'){
+			# print Data::Dumper::Dumper $three;
+			$args = "\n${spacer}Args: " . joiner($three, '; ', 'unset');
+		}
+		else {
+			$args = "\n${spacer}Args: None";
+		}
+		# $t1 = [gettimeofday];
+		#$t3 = tv_interval ($t0, [gettimeofday]);
+		$t3 = eval 'Time::HiRes::tv_interval(\@t0, [Time::HiRes::gettimeofday()])' if $b_hires;
+		# print Dumper $@;
+		$data = "Start: Function: $two$args\n${spacer}Elapsed: $t3\n";
+		$spacer='';
+		$timer = $data if $debugger{'timers'};
+	}
+	elsif ($one eq 'fe'){
+		# print 'timer:', Time::HiRes::tv_interval(\@t0, [Time::HiRes::gettimeofday()]),"\n";
+		#$t3 = tv_interval ($t0, [gettimeofday]);
+		eval '$t3 = Time::HiRes::tv_interval(\@t0, [Time::HiRes::gettimeofday()])' if $b_hires;
+		# print Dumper $t3;
+		$data = "${spacer}Elapsed: $t3\nEnd: Function: $two\n";
+		$spacer='';
+		$timer = $data if $debugger{'timers'};
+	}
+	elsif ($one eq 'cat'){
+		if ($b_log_full){
+			foreach my $file ($two){
+				my $contents = do { local(@ARGV, $/) = $file; <> }; # or: qx(cat $file)
+				$data = "$data${line3}Full file data: $file\n\n$contents\n$line3\n";
+			}
+			$spacer='';
+		}
+	}
+	elsif ($one eq 'cmd'){
+		$data = "Command: $two\n";
+		$data .= qx($two);
+	}
+	elsif ($one eq 'data'){
+		$data = "$two\n";
+	}
+	elsif ($one eq 'dump'){
+		$data = "$two:\n";
+		if (ref $three eq 'HASH'){
+			$data .= Data::Dumper::Dumper $three;
+		}
+		elsif (ref $three eq 'ARRAY'){
+			# print Data::Dumper::Dumper $three;
+			$data .= Data::Dumper::Dumper $three;
+		}
+		else {
+			$data .= Data::Dumper::Dumper $three;
+		}
+		$data .= "\n";
+		# print $data;
+	}
+	elsif ($one eq 'raw'){
+		if ($b_log_full){
+			$data = "\n${line3}Raw System Data:\n\n$two\n$line3";
+			$spacer='';
+		}
+	}
+	else {
+		$data = "$two\n";
+	}
+	if ($debugger{'timers'}){
+		print $timer if $timer;
+	}
+	# print "d: $data";
+	elsif ($data){
+		print $fh_l "$spacer$data";
+	}
 }
 
 sub set_debugger {
-    user_debug_test_1() if $debugger{'test-1'};
-    if ( $debug >= 20){
-        error_handler('not-in-irc', 'debug data generator') if $b_irc;
-        my $option = ( $debug > 22 ) ? 'main-full' : 'main';
-        $debugger{'gz'} = 1 if ($debug == 22 || $debug == 24);
-        my $ob_sys = SystemDebugger->new($option);
-        $ob_sys->run_debugger();
-        $ob_sys->upload_file($ftp_alt) if $debug > 20;
-        exit 0;
-    }
-    elsif ($debug >= 10 && $debug <= 12){
-        $b_log = 1;
-        if ($debug == 11){
-            $b_log_full = 1;
-        }
-        elsif ($debug == 12){
-            $b_log_colors = 1;
-        }
-        begin_logging();
-    }
-    elsif ($debug <= 3){
-        if ($debug == 3){
-            $b_log = 1;
-            $debugger{'timers'} = 1;
-            begin_logging();
-        }
-        else {
-            $end = '';
-            $start = '';
-        }
-    }
+	user_debug_test_1() if $debugger{'test-1'};
+	if ($debugger{'level'} >= 20){
+		error_handler('not-in-irc', 'debug data generator') if $b_irc;
+		my $option = ($debugger{'level'} > 22) ? 'main-full' : 'main';
+		$debugger{'gz'} = 1 if ($debugger{'level'} == 22 || $debugger{'level'} == 24);
+		my $ob_sys = SystemDebugger->new($option);
+		$ob_sys->run_debugger();
+		$ob_sys->upload_file($ftp_alt) if $debugger{'level'} > 20;
+		exit 0;
+	}
+	elsif ($debugger{'level'} >= 10 && $debugger{'level'} <= 12){
+		$b_log = 1;
+		if ($debugger{'level'} == 11){
+			$b_log_full = 1;
+		}
+		elsif ($debugger{'level'} == 12){
+			$b_log_colors = 1;
+		}
+		begin_logging();
+	}
+	elsif ($debugger{'level'} <= 3){
+		if ($debugger{'level'} == 3){
+			$b_log = 1;
+			$debugger{'timers'} = 1;
+			begin_logging();
+		}
+		else {
+			$end = '';
+			$start = '';
+		}
+	}
 }
 
 ## SystemDebugger
 {
 package SystemDebugger;
-
-# use File::Find q(find);
-#no warnings 'File::Find';
-# use File::Spec::Functions;
-#use File::Copy;
-#use POSIX qw(strftime);
-
 my $option = 'main';
 my ($data_dir,$debug_dir,$debug_gz,$parse_src,$upload) = ('','','','','');
-my @content = (); 
+my @content; 
 my $b_debug = 0;
 my $b_delete_dir = 1;
 # args: 1 - type
 # args: 2 - upload
 sub new {
-    my $class = shift;
-    ($option) = @_;
-    my $self = {};
-    # print "$f\n";
-    # print "$option\n";
-    return bless $self, $class;
+	my $class = shift;
+	($option) = @_;
+	my $self = {};
+	# print "$f\n";
+	# print "$option\n";
+	return bless $self, $class;
 }
 
 sub run_debugger {
-    #require File::Find;
-    #import File::Find::Functions;
-    require File::Copy;
-    import File::Copy;
-    require File::Spec::Functions;
-    import File::Spec::Functions;
-    
-    print "Starting $self_name debugging data collector...\n";
-    create_debug_directory();
-    print "Note: for dmidecode data you must be root.\n" if !$b_root;
-    print $line3;
-    if (!$b_debug){
-        audio_data();
-        disk_data();
-        display_data();
-        network_data();
-        perl_modules();
-        system_data();
-    }
-    system_files();
-    print $line3;
-    if (!$b_debug){
-        # note: android has unreadable /sys, but -x and -r tests pass
-        # main::globber('/sys/*') && 
-        if ( main::count_dir_files('/sys') ){
-            build_tree('sys');
-            # kernel crash, not sure what creates it, for ppc, as root
-            sys_traverse_data() if ($debugger{'sys'} && ($debugger{'sys-force'} || !$b_root || !$b_ppc )) ; 
-        }
-        else {
-            print "Skipping /sys data collection. /sys not present, or empty.\n";
-        }
-        print $line3;
-        # note: proc has some files that are apparently kernel processes, I've tried 
-        # filtering them out but more keep appearing, so only run proc debugger if not root
-        if ( !$debugger{'no-proc'} && (!$b_root || $debugger{'proc'} ) && -d '/proc' && main::count_dir_files('/proc') ){
-            build_tree('proc');
-            proc_traverse_data();
-        }
-        else {
-            print "Skipping /proc data collection.\n";
-        }
-        print $line3;
-    }
-    run_self();
-    print $line3;
-    compress_dir();
+	print "Starting $self_name debugging data collector...\n";
+	print "Loading required debugger Perl File:: modules... \n";
+	# Fedora/Redhat doesn't include File::Find File::Copy in 
+	# core modules. why? Or rather, they deliberately removed them.
+	if (main::check_perl_module('File::Find')){
+		File::Find->import;
+	}
+	else {
+		main::error_handler('required-module', 'File', 'File::Find');
+	}
+	if (main::check_perl_module('File::Copy')){
+		File::Copy->import;
+	}
+	else {
+		main::error_handler('required-module', 'File', 'File::Copy');
+	}
+	if (main::check_perl_module('File::Spec::Functions')){
+		File::Spec::Functions->import;
+	}
+	else {
+		main::error_handler('required-module', 'File', 'File::Spec::Functions');
+	}
+	if ($debugger{'level'} > 20){
+		if (main::check_perl_module('Net::FTP')){
+			Net::FTP->import;
+		}
+		else {
+			main::error_handler('required-module', 'Net', 'Net::FTP');
+		}
+	}
+	create_debug_directory();
+	print "Note: for dmidecode, smartctl, lvm data you must be root.\n" if !$b_root;
+	print $line3;
+	if (!$b_debug){
+		audio_data();
+		bluetooth_data();
+		disk_data();
+		display_data();
+		network_data();
+		perl_modules();
+		system_data();
+	}
+	system_files();
+	print $line3;
+	if (!$b_debug){
+		# note: android has unreadable /sys, but -x and -r tests pass
+		# main::globber('/sys/*') && 
+		if ($debugger{'sys'} && main::count_dir_files('/sys')){
+			build_tree('sys');
+			# kernel crash, not sure what creates it, for ppc, as root
+			sys_traverse_data() if ($debugger{'sys'} && ($debugger{'sys-force'} || !$b_root || !$b_ppc)) ; 
+		}
+		else {
+			print "Skipping /sys data collection.\n";
+		}
+		print $line3;
+		# note: proc has some files that are apparently kernel processes, I've tried 
+		# filtering them out but more keep appearing, so only run proc debugger if not root
+		if (!$debugger{'no-proc'} && (!$b_root || $debugger{'proc'}) && -d '/proc' && main::count_dir_files('/proc')){
+			build_tree('proc');
+			proc_traverse_data();
+		}
+		else {
+			print "Skipping /proc data collection.\n";
+		}
+		print $line3;
+	}
+	run_self();
+	print $line3;
+	compress_dir();
 }
 
 sub create_debug_directory {
-    my $host = main::get_hostname();
-    $host =~ s/ /-/g;
-    $host = 'no-host' if !$host || $host eq 'N/A';
-    my ($alt_string,$bsd_string,$root_string) = ('','','');
-    # note: Time::Piece was introduced in perl 5.9.5
-    my ($sec,$min,$hour,$mday,$mon,$year) = localtime;
-    $year = $year+1900;
-    $mon += 1;
-    if (length($sec)  == 1) {$sec = "0$sec";}
-    if (length($min)  == 1) {$min = "0$min";}
-    if (length($hour) == 1) {$hour = "0$hour";}
-    if (length($mon)  == 1) {$mon = "0$mon";}
-    if (length($mday) == 1) {$mday = "0$mday";}
-    
-    my $today = "$year-$mon-${mday}_$hour$min$sec";
-    # my $date = strftime "-%Y-%m-%d_", localtime;
-    if ($b_root){
-        $root_string = '-root';
-    }
-    $bsd_string = "-BSD-$bsd_type" if $bsd_type;
-    if ($b_arm ){$alt_string = '-ARM'}
-    elsif ($b_mips) {$alt_string = '-MIPS'}
-    elsif ($b_ppc) {$alt_string = '-PPC'}
-    elsif ($b_sparc) {$alt_string = '-SPARC'}
-    $debug_dir = "$self_name$alt_string$bsd_string-$host-$today$root_string-$self_version";
-    $debug_gz = "$debug_dir.tar.gz";
-    $data_dir = "$user_data_dir/$debug_dir";
-    if ( -d $data_dir ){
-        unlink $data_dir or main::error_handler('remove', "$data_dir", "$!");
-    }
-    mkdir $data_dir or main::error_handler('mkdir', "$data_dir", "$!");
-    if ( -e "$user_data_dir/$debug_gz" ){
-        #rmdir "$user_data_dir$debug_gz" or main::error_handler('remove', "$user_data_dir/$debug_gz", "$!");
-        print "Failed removing leftover directory:\n$user_data_dir$debug_gz error: $?" if system('rm','-rf',"$user_data_dir$debug_gz");
-    }
-    print "Data going into:\n$data_dir\n";
+	my $host = main::get_hostname();
+	$host =~ s/ /-/g;
+	$host = 'no-host' if !$host || $host eq 'N/A';
+	my ($alt_string,$bsd_string,$root_string) = ('','','');
+	# note: Time::Piece was introduced in perl 5.9.5
+	my ($sec,$min,$hour,$mday,$mon,$year) = localtime;
+	$year = $year+1900;
+	$mon += 1;
+	if (length($sec)  == 1){$sec = "0$sec";}
+	if (length($min)  == 1){$min = "0$min";}
+	if (length($hour) == 1){$hour = "0$hour";}
+	if (length($mon)  == 1){$mon = "0$mon";}
+	if (length($mday) == 1){$mday = "0$mday";}
+	my $today = "$year-$mon-${mday}_$hour$min$sec";
+	# my $date = strftime "-%Y-%m-%d_", localtime;
+	if ($b_root){
+		$root_string = '-root';
+	}
+	$bsd_string = "-BSD-$bsd_type" if $bsd_type;
+	my $id = ($debugger{'id'}) ? '-' . $debugger{'id'}: '';
+	if ($b_arm){$alt_string = '-ARM'}
+	elsif ($b_mips){$alt_string = '-MIPS'}
+	elsif ($b_ppc){$alt_string = '-PPC'}
+	elsif ($b_sparc){$alt_string = '-SPARC'}
+	$debug_dir = "$self_name$alt_string$bsd_string-$host$id-$today$root_string-$self_version-$self_patch";
+	$debug_gz = "$debug_dir.tar.gz";
+	$data_dir = "$user_data_dir/$debug_dir";
+	if (-d $data_dir){
+		unlink $data_dir or main::error_handler('remove', "$data_dir", "$!");
+	}
+	mkdir $data_dir or main::error_handler('mkdir', "$data_dir", "$!");
+	if (-e "$user_data_dir/$debug_gz"){
+		#rmdir "$user_data_dir$debug_gz" or main::error_handler('remove', "$user_data_dir/$debug_gz", "$!");
+		print "Failed removing leftover directory:\n$user_data_dir$debug_gz error: $?" if system('rm','-rf',"$user_data_dir$debug_gz");
+	}
+	print "Debugger data going into:\n$data_dir\n";
 }
 sub compress_dir {
-    print "Creating tar.gz compressed file of this material...\n";
-    print "File: $debug_gz\n";
-    system("cd $user_data_dir; tar -czf $debug_gz $debug_dir");
-    print "Removing $data_dir...\n";
-    #rmdir $data_dir or print "failed removing: $data_dir error: $!\n";
-    return 1 if !$b_delete_dir;
-    if (system('rm','-rf',$data_dir) ){
-        print "Failed removing: $data_dir\nError: $?\n";
-    }
-    else {
-        print "Directory removed.\n";
-    }
+	print "Creating tar.gz compressed file of this material...\n";
+	print "File: $debug_gz\n";
+	system("cd $user_data_dir; tar -czf $debug_gz $debug_dir");
+	print "Removing $data_dir...\n";
+	#rmdir $data_dir or print "failed removing: $data_dir error: $!\n";
+	return 1 if !$b_delete_dir;
+	if (system('rm','-rf',$data_dir)){
+		print "Failed removing: $data_dir\nError: $?\n";
+	}
+	else {
+		print "Directory removed.\n";
+	}
 }
 # NOTE: incomplete, don't know how to ever find out 
 # what sound server is actually running, and is in control
 sub audio_data {
-    my (%data,@files,@files2);
-    print "Collecting audio data...\n";
-    my @cmds = (
-    ['aplay', '-l'], # alsa
-    ['pactl', 'list'], # pulseaudio
-    );
-    run_commands(\@cmds,'audio');
-    @files = main::globber('/proc/asound/card*/codec*');
-    if (@files){
-        my $asound = qx(head -n 1 /proc/asound/card*/codec* 2>&1);
-        $data{'proc-asound-codecs'} = $asound;
-    }
-    else {
-        $data{'proc-asound-codecs'} = undef;
-    }
-    
-    write_data(\%data,'audio');
-    @files = (
-    '/proc/asound/cards',
-    '/proc/asound/version',
-    );
-    @files2 = main::globber('/proc/asound/*/usbid');
-    @files = (@files,@files2) if @files2;
-    copy_files(\@files,'audio');
+	my (%data,@files,@files2);
+	print "Collecting audio data...\n";
+	my @cmds = (
+	['aplay', '-l'], # alsa
+	['pactl', 'list'], # pulseaudio
+	);
+	run_commands(\@cmds,'audio');
+	@files = main::globber('/proc/asound/card*/codec*');
+	if (@files){
+		my $asound = qx(head -n 1 /proc/asound/card*/codec* 2>&1);
+		$data{'proc-asound-codecs'} = $asound;
+	}
+	else {
+		$data{'proc-asound-codecs'} = undef;
+	}
+	write_data(\%data,'audio');
+	@files = (
+	'/proc/asound/cards',
+	'/proc/asound/version',
+	);
+	@files2 = main::globber('/proc/asound/*/usbid');
+	push(@files,@files2) if @files2;
+	copy_files(\@files,'audio');
+}
+sub bluetooth_data {
+	print "Collecting bluetooth data...\n";
+# 	no warnings 'uninitialized';
+	my @cmds = (
+	['hciconfig','-a'],
+	#['hcidump',''], # hangs sometimes
+	['hcitool','dev'],
+	['rfkill','--output-all'],
+	);
+	# these hang if bluetoothd not enabled
+	if (@ps_cmd && (grep {m|/bluetoothd|} @ps_cmd)){
+		push(@cmds,
+		['bt-adapter','--list'],
+		['bt-adapter','--info'],
+		['bluetoothctl','-- list'],
+		['bluetoothctl','-- show']
+		);
+	}
+	run_commands(\@cmds,'bluetooth');
 }
+
 ## NOTE: >/dev/null 2>&1 is sh, and &>/dev/null is bash, fix this
 # ls -w 1 /sysrs > tester 2>&1
 sub disk_data {
-    my (%data,@files,@files2);
-    print "Collecting dev, label, disk, uuid data, df...\n";
-    @files = (
-    '/etc/fstab',
-    '/etc/mtab',
-    '/proc/mdstat',
-    '/proc/mounts',
-    '/proc/partitions',
-    '/proc/scsi/scsi',
-    '/proc/sys/dev/cdrom/info',
-    );
-    # very old systems
-    if (-d '/proc/ide/'){
-        my @ides = main::globber('/proc/ide/*/*');
-        @files = (@files, @ides) if @ides;
-    }
-    else {
-        push (@files, '/proc-ide-directory');
-    }
-    copy_files(\@files, 'disk');
-    my @cmds = (
-    ['blockdev', '--report'],
-    ['btrfs', 'filesystem show'],
-    ['btrfs', 'filesystem show --mounted'],
-    # ['btrfs', 'filesystem show --all-devices'],
-    ['df', '-h -T'],
-    ['df', '-h'],
-    ['df', '-k'],
-    ['df', '-k -T'],
-    ['df', '-k -T -P'],
-    ['df', '-k -T -P -a'],
-    ['df', '-P'],
-    ['findmnt', ''],
-    ['findmnt', '--df --no-truncate'],
-    ['findmnt', '--list --no-truncate'],
-    ['lsblk', '-fs'],
-    ['lsblk', '-fsr'],
-    ['lsblk', '-fsP'],
-    ['lsblk', '-a'],
-    ['lsblk', '-aP'],
-    ['lsblk', '-ar'],
-    ['lsblk', '-p'],
-    ['lsblk', '-pr'],
-    ['lsblk', '-pP'],
-    ['lsblk', '-r'],
-    ['lsblk', '-r --output NAME,PKNAME,TYPE,RM,FSTYPE,SIZE,LABEL,UUID,MOUNTPOINT,PHY-SEC,LOG-SEC'],
-    ['lsblk', '-rb --output NAME,PKNAME,TYPE,RM,FSTYPE,SIZE,LABEL,UUID,MOUNTPOINT,PHY-SEC,LOG-SEC'],
-    ['lsblk', '-Pb --output NAME,PKNAME,TYPE,RM,FSTYPE,SIZE'],
-    ['lsblk', '-Pb --output NAME,TYPE,RM,FSTYPE,SIZE,LABEL,UUID,SERIAL,MOUNTPOINT,PHY-SEC,LOG-SEC'],
-    ['gpart', 'list'],
-    ['gpart', 'show'],
-    ['gpart', 'status'],
-    ['ls', '-l /dev'],
-    ['ls', '-l /dev/disk'],
-    ['ls', '-l /dev/disk/by-id'],
-    ['ls', '-l /dev/disk/by-label'],
-    ['ls', '-l /dev/disk/by-uuid'],
-    # http://comments.gmane.org/gmane.linux.file-systems.zfs.user/2032
-    ['ls', '-l /dev/disk/by-wwn'],
-    ['ls', '-l /dev/disk/by-path'],
-    ['ls', '-l /dev/mapper'],
-    # LSI raid https://hwraid.le-vert.net/wiki/LSIMegaRAIDSAS
-    ['megacli', '-AdpAllInfo -aAll'],
-    ['megacli', '-LDInfo -L0 -a0'],
-    ['megacli', '-PDList -a0'],
-    ['megaclisas-status', ''],
-    ['megaraidsas-status', ''],
-    ['megasasctl', ''],
-    ['mount', ''],
-    ['nvme', 'present'],
-    ['readlink', '/dev/root'],
-    ['swapon', '-s'],
-    # 3ware-raid
-    ['tw-cli', 'info'],
-    ['zfs', 'list'],
-    ['zpool', 'list'],
-    ['zpool', 'list -v'],
-    );
-    run_commands(\@cmds,'disk');
-    @cmds = (
-    ['atacontrol', 'list'],
-    ['camcontrol', 'devlist'], 
-    ['glabel', 'status'], 
-    ['swapctl', '-l -k'],
-    ['swapctl', '-l -k'],
-    ['vmstat', '-H'],
-    );
-    run_commands(\@cmds,'disk-bsd');
+	my (%data,@files,@files2);
+	print "Collecting dev, label, disk, uuid data, df...\n";
+	@files = (
+	'/etc/fstab',
+	'/etc/mtab',
+	'/proc/devices',
+	'/proc/mdstat',
+	'/proc/mounts',
+	'/proc/partitions',
+	'/proc/scsi/scsi',
+	'/proc/sys/dev/cdrom/info',
+	);
+	# very old systems
+	if (-d '/proc/ide/'){
+		my @ides = main::globber('/proc/ide/*/*');
+		push(@files, @ides) if @ides;
+	}
+	else {
+		push(@files, '/proc-ide-directory');
+	}
+	copy_files(\@files, 'disk');
+	my @cmds = (
+	['blockdev', '--report'],
+	['btrfs', 'fi show'],
+	['btrfs', 'filesystem show'],
+	['btrfs', 'filesystem show --mounted'],
+	# ['btrfs', 'filesystem show --all-devices'],
+	['df', '-h -T'],
+	['df', '-h'],
+	['df', '-k'],
+	['df', '-k -T'],
+	['df', '-k -T -P'],
+	['df', '-k -T -P -a'],
+	['df', '-P'],
+	['dmsetup', 'ls --tree'],
+	['findmnt', ''],
+	['findmnt', '--df --no-truncate'],
+	['findmnt', '--list --no-truncate'],
+	['gpart', 'list'],
+	['gpart', 'show'],
+	['gpart', 'status'],
+	['ls', '-l /dev'],
+	# block is for mmcblk / arm devices
+	['ls', '-l /dev/block'],
+	['ls', '-l /dev/block/bootdevice'],
+	['ls', '-l /dev/block/bootdevice/by-name'],
+	['ls', '-l /dev/disk'],
+	['ls', '-l /dev/disk/by-id'],
+	['ls', '-l /dev/disk/by-label'],
+	['ls', '-l /dev/disk/by-partlabel'],
+	['ls', '-l /dev/disk/by-partuuid'],
+	['ls', '-l /dev/disk/by-path'],
+	['ls', '-l /dev/disk/by-uuid'],
+	# http://comments.gmane.org/gmane.linux.file-systems.zfs.user/2032
+	['ls', '-l /dev/disk/by-wwn'],
+	['ls', '-l /dev/mapper'],
+	['lsblk', '-fs'],
+	['lsblk', '-fsr'],
+	['lsblk', '-fsP'],
+	['lsblk', '-a'],
+	['lsblk', '-aP'],
+	['lsblk', '-ar'],
+	['lsblk', '-p'],
+	['lsblk', '-pr'],
+	['lsblk', '-pP'],
+	['lsblk', '-r'],
+	['lsblk', '-r --output NAME,PKNAME,TYPE,RM,FSTYPE,SIZE,LABEL,UUID,MOUNTPOINT,PHY-SEC,LOG-SEC,PARTFLAGS'],
+	['lsblk', '-rb --output NAME,PKNAME,TYPE,RM,FSTYPE,SIZE,LABEL,UUID,MOUNTPOINT,PHY-SEC,LOG-SEC,PARTFLAGS'],
+	['lsblk', '-rb --output NAME,TYPE,RM,FSTYPE,SIZE,LABEL,UUID,SERIAL,MOUNTPOINT,PHY-SEC,LOG-SEC,PARTFLAGS,MAJ:MIN,PKNAME'],
+	['lsblk', '-Pb --output NAME,PKNAME,TYPE,RM,FSTYPE,SIZE'],
+	['lsblk', '-Pb --output NAME,TYPE,RM,FSTYPE,SIZE,LABEL,UUID,SERIAL,MOUNTPOINT,PHY-SEC,LOG-SEC,PARTFLAGS'],
+	# this should always be the live command used internally:
+	['lsblk', '-bP --output NAME,TYPE,RM,FSTYPE,SIZE,LABEL,UUID,SERIAL,MOUNTPOINT,PHY-SEC,LOG-SEC,PARTFLAGS,MAJ:MIN,PKNAME'],
+	['lvdisplay', '-c'],
+	['lvdisplay', '-cv'],
+	['lvdisplay', '-cv --segments'],
+	['lvdisplay', '-m --segments'],
+	['lvdisplay', '-ma --segments'],
+	['lvs', '--separator :'],
+	['lvs', '--separator : --segments'],
+	['lvs', '-o +devices --separator : --segments'],
+	['lvs', '-o +devices -v --separator : --segments'],
+	['lvs', '-o +devices -av --separator : --segments'],
+	['lvs', '-o +devices -aPv --separator : --segments'],
+	# LSI raid https://hwraid.le-vert.net/wiki/LSIMegaRAIDSAS
+	['megacli', '-AdpAllInfo -aAll'],
+	['megacli', '-LDInfo -L0 -a0'],
+	['megacli', '-PDList -a0'],
+	['megaclisas-status', ''],
+	['megaraidsas-status', ''],
+	['megasasctl', ''],
+	['mount', ''],
+	['nvme', 'present'],
+	['pvdisplay', '-c'],
+	['pvdisplay', '-cv'],
+	['pvdisplay', '-m'],
+	['pvdisplay', '-ma'],
+	['pvs', '--separator :'],
+	['pvs', '--separator : --segments'],
+	['pvs', '-a --separator : --segments'],
+	['pvs', '-av --separator : --segments'],
+	['pvs', '-aPv --separator : --segments -o +pv_major,pv_minor'],
+	['pvs', '-v --separator : --segments'],
+	['pvs', '-Pv --separator : --segments'],
+	['pvs', '--segments  -o pv_name,pv_size,seg_size,vg_name,lv_name,lv_size,seg_pe_ranges'],
+	['readlink', '/dev/root'],
+	['swapon', '-s'],
+	# 3ware-raid
+	['tw-cli', 'info'],
+	['vgdisplay', ''],
+	['vgdisplay', '-v'],
+	['vgdisplay', '-c'],
+	['vgdisplay', '-vc'],
+	['vgs', '--separator :'],
+	['vgs', '-av --separator :'],
+	['vgs', '-aPv --separator :'],
+	['vgs', '-v --separator :'],
+	['vgs', '-o +pv_name --separator :'],
+	['zfs', 'list'],
+	['zpool', 'list'],
+	['zpool', 'list -v'],
+	);
+	run_commands(\@cmds,'disk');
+	@cmds = (
+	['atacontrol', 'list'],
+	['camcontrol', 'devlist'], 
+	['camcontrol', 'devlist -v'], 
+	['geom', 'part list'],
+	['glabel', 'status'], 
+	['gpart', 'list'], # gpart in linux/bsd but do it here again
+	['gpart', 'show'],
+	['gpart', 'status'],
+	['swapctl', '-l -k'],
+	['swapctl', '-l -k'],
+	['vmstat', ''],
+	['vmstat', '-H'],
+	);
+	run_commands(\@cmds,'disk-bsd');
 }
 sub display_data {
-    my (%data,@files,@files2);
-    my $working = '';
-    if ( ! $b_display ){
-        print "Warning: only some of the data collection can occur if you are not in X\n";
-        main::toucher("$data_dir/display-data-warning-user-not-in-x");
-    }
-    if ( $b_root ){
-        print "Warning: only some of the data collection can occur if you are running as Root user\n";
-        main::toucher("$data_dir/display-data-warning-root-user");
-    }
-    print "Collecting Xorg log and xorg.conf files...\n";
-    if ( -d "/etc/X11/xorg.conf.d/" ){
-        @files = main::globber("/etc/X11/xorg.conf.d/*");
-    }
-    else {
-        @files = ('/xorg-conf-d');
-    }
-    push (@files, $files{'xorg-log'});
-    push (@files, '/etc/X11/xorg.conf');
-    copy_files(\@files,'display-xorg');
-    print "Collecting X, xprop, glxinfo, xrandr, xdpyinfo data, wayland, weston...\n";
-    %data = (
-    'desktop-session' => $ENV{'DESKTOP_SESSION'},
-    'gdmsession' => $ENV{'GDMSESSION'},
-    'gnome-desktop-session-id' => $ENV{'GNOME_DESKTOP_SESSION_ID'},
-    'kde-full-session' => $ENV{'KDE_FULL_SESSION'},
-    'kde-session-version' => $ENV{'KDE_SESSION_VERSION'},
-    'vdpau-driver' => $ENV{'VDPAU_DRIVER'},
-    'xdg-current-desktop' => $ENV{'XDG_CURRENT_DESKTOP'},
-    'xdg-session-desktop' => $ENV{'XDG_SESSION_DESKTOP'},
-    'xdg-vtnr' => $ENV{'XDG_VTNR'},
-    # wayland data collectors:
-    'xdg-session-type' => $ENV{'XDG_SESSION_TYPE'},
-    'wayland-display' =>  $ENV{'WAYLAND_DISPLAY'},
-    'gdk-backend' => $ENV{'GDK_BACKEND'},
-    'qt-qpa-platform' => $ENV{'QT_QPA_PLATFORM'},
-    'clutter-backend' => $ENV{'CLUTTER_BACKEND'},
-    'sdl-videodriver' => $ENV{'SDL_VIDEODRIVER'},
-    # program display values
-    'size-indent' => $size{'indent'},
-    'size-indent-min' => $size{'indent-min'},
-    'size-cols-max' => $size{'max'},
-    );
-    write_data(\%data,'display');
-    my @cmds = (
-    # kde 5/plasma desktop 5, this is maybe an extra package and won't be used
-    ['about-distro',''],
-    ['aticonfig','--adapter=all --od-gettemperature'],
-    ['glxinfo',''],
-    ['glxinfo','-B'],
-    ['kded','--version'],
-    ['kded1','--version'],
-    ['kded2','--version'],
-    ['kded3','--version'],
-    ['kded4','--version'],
-    ['kded5','--version'],
-    ['kded6','--version'],
-    ['kf4-config','--version'],
-    ['kf5-config','--version'],
-    ['kf6-config','--version'],
-    ['kwin_x11','--version'],
-    # ['locate','/Xorg'], # for Xorg.wrap problem
-    ['loginctl','--no-pager list-sessions'],
-    ['nvidia-settings','-q screens'],
-    ['nvidia-settings','-c :0.0 -q all'],
-    ['nvidia-smi','-q'],
-    ['nvidia-smi','-q -x'],
-    ['plasmashell','--version'],
-    ['vainfo',''],
-    ['vdpauinfo',''],
-    ['weston-info',''], 
-    ['wmctrl','-m'],
-    ['weston','--version'],
-    ['xdpyinfo',''],
-    ['Xorg','-version'],
-    ['xprop','-root'],
-    ['xrandr',''],
-    );
-    run_commands(\@cmds,'display');
+	my (%data,@files,@files2);
+	my $working = '';
+	if (!$b_display){
+		print "Warning: only some of the data collection can occur if you are not in X\n";
+		main::toucher("$data_dir/display-data-warning-user-not-in-x");
+	}
+	if ($b_root){
+		print "Warning: only some of the data collection can occur if you are running as Root user\n";
+		main::toucher("$data_dir/display-data-warning-root-user");
+	}
+	print "Collecting Xorg log and xorg.conf files...\n";
+	if (-d "/etc/X11/xorg.conf.d/"){
+		@files = main::globber("/etc/X11/xorg.conf.d/*");
+	}
+	else {
+		@files = ('/xorg-conf-d');
+	}
+	# keep this updated to handle all possible locations we know about for Xorg.0.log
+	# not using $system_files{'xorg-log'} for now though it would be best to know what file is used
+	main::set_xorg_log();
+	push(@files, '/var/log/Xorg.0.log');
+	push(@files, '/var/lib/gdm/.local/share/xorg/Xorg.0.log');
+	push(@files, $ENV{'HOME'} . '/.local/share/xorg/Xorg.0.log');
+	push(@files, $system_files{'xorg-log'}) if $system_files{'xorg-log'};
+	push(@files, '/etc/X11/xorg.conf');
+	copy_files(\@files,'display-xorg');
+	print "Collecting X, xprop, glxinfo, xrandr, xdpyinfo data, wayland, weston...\n";
+	%data = (
+	'desktop-session' => $ENV{'DESKTOP_SESSION'},
+	'gdmsession' => $ENV{'GDMSESSION'},
+	'gnome-desktop-session-id' => $ENV{'GNOME_DESKTOP_SESSION_ID'},
+	'kde-full-session' => $ENV{'KDE_FULL_SESSION'},
+	'kde-session-version' => $ENV{'KDE_SESSION_VERSION'},
+	'vdpau-driver' => $ENV{'VDPAU_DRIVER'},
+	'xdg-current-desktop' => $ENV{'XDG_CURRENT_DESKTOP'},
+	'xdg-session-desktop' => $ENV{'XDG_SESSION_DESKTOP'},
+	'xdg-vtnr' => $ENV{'XDG_VTNR'},
+	# wayland data collectors:
+	'xdg-session-type' => $ENV{'XDG_SESSION_TYPE'},
+	'wayland-display' =>  $ENV{'WAYLAND_DISPLAY'},
+	'gdk-backend' => $ENV{'GDK_BACKEND'},
+	'qt-qpa-platform' => $ENV{'QT_QPA_PLATFORM'},
+	'clutter-backend' => $ENV{'CLUTTER_BACKEND'},
+	'sdl-videodriver' => $ENV{'SDL_VIDEODRIVER'},
+	# program display values
+	'size-cols-max' => $size{'max'},
+	'size-indent' => $size{'indent'},
+	'size-wrap-width' => $size{'wrap-max'},
+	);
+	write_data(\%data,'display');
+	my @cmds = (
+	# kde 5/plasma desktop 5, this is maybe an extra package and won't be used
+	['about-distro',''],
+	['aticonfig','--adapter=all --od-gettemperature'],
+	['glxinfo',''],
+	['glxinfo','-B'],
+	['kded','--version'],
+	['kded1','--version'],
+	['kded2','--version'],
+	['kded3','--version'],
+	['kded4','--version'],
+	['kded5','--version'],
+	['kded6','--version'],
+	['kded7','--version'],
+	['kf-config','--version'],
+	['kf4-config','--version'],
+	['kf5-config','--version'],
+	['kf6-config','--version'],
+	['kf7-config','--version'],
+	['kwin_x11','--version'],
+	# ['locate','/Xorg'], # for Xorg.wrap problem
+	['loginctl','--no-pager list-sessions'],
+	['nvidia-settings','-q screens'],
+	['nvidia-settings','-c :0.0 -q all'],
+	['nvidia-smi','-q'],
+	['nvidia-smi','-q -x'],
+	['plasmashell','--version'],
+	['vainfo',''],
+	['vdpauinfo',''],
+	['vulkaninfo',''],
+	['weston-info',''], 
+	['wmctrl','-m'],
+	['weston','--version'],
+	['xdpyinfo',''],
+	['Xorg','-version'],
+	['xprop','-root'],
+	['xrandr',''],
+	);
+	run_commands(\@cmds,'display');
 }
 sub network_data {
-    print "Collecting networking data...\n";
-#   no warnings 'uninitialized';
-    my @cmds = (
-    ['ifconfig',''],
-    ['ip','addr'],
-    ['ip','-s link'],
-    );
-    run_commands(\@cmds,'network');
+	print "Collecting networking data...\n";
+# 	no warnings 'uninitialized';
+	my @cmds = (
+	['ifconfig',''],
+	['ip','addr'],
+	['ip','-s link'],
+	);
+	run_commands(\@cmds,'network');
 }
 sub perl_modules {
-    print "Collecting Perl module data (this can take a while)...\n";
-    my @modules = ();
-    my ($dirname,$holder,$mods,$value) = ('','','','');
-    my $filename = 'perl-modules.txt';
-    my @inc;
-    foreach (sort @INC){
-        # some BSD installs have '.' n @INC path
-        if (-d $_ && $_ ne '.'){
-            $_ =~ s/\/$//; # just in case, trim off trailing slash
-            $value .= "EXISTS: $_\n";
-            push @inc, $_;
-        } 
-        else {
-            $value .= "ABSENT: $_\n";
-        }
-    }
-    main::writer("$data_dir/perl-inc-data.txt",$value);
-    File::Find::find { wanted => sub { 
-        push @modules, File::Spec->canonpath($_) if /\.pm\z/  
-    }, no_chdir => 1 }, @inc;
-    @modules = sort(@modules);
-    foreach (@modules){
-        my $dir = $_;
-        $dir =~ s/[^\/]+$//;
-        if (!$holder || $holder ne $dir ){
-            $holder = $dir;
-            $value = "DIR: $dir\n";
-            $_ =~ s/^$dir//;
-            $value .= " $_\n";
-        }
-        else {
-            $value = $_;
-            $value =~ s/^$dir//;
-            $value = " $value\n";
-        }
-        $mods .= $value;
-    }
-    open (my $fh, '>', "$data_dir/$filename");
-    print $fh $mods;
-    close $fh;
+	print "Collecting Perl module data (this can take a while)...\n";
+	my @modules;
+	my ($dirname,$holder,$mods,$value) = ('','','','');
+	my $filename = 'perl-modules.txt';
+	my @inc;
+	foreach (sort @INC){
+		# some BSD installs have '.' n @INC path
+		if (-d $_ && $_ ne '.'){
+			$_ =~ s/\/$//; # just in case, trim off trailing slash
+			$value .= "EXISTS: $_\n";
+			push(@inc, $_);
+		} 
+		else {
+			$value .= "ABSENT: $_\n";
+		}
+	}
+	main::writer("$data_dir/perl-inc-data.txt",$value);
+	File::Find::find({ wanted => sub { 
+		push(@modules, File::Spec->canonpath($_)) if /\.pm\z/  
+	}, no_chdir => 1 }, @inc);
+	@modules = sort @modules;
+	foreach (@modules){
+		my $dir = $_;
+		$dir =~ s/[^\/]+$//;
+		if (!$holder || $holder ne $dir){
+			$holder = $dir;
+			$value = "DIR: $dir\n";
+			$_ =~ s/^$dir//;
+			$value .= " $_\n";
+		}
+		else {
+			$value = $_;
+			$value =~ s/^$dir//;
+			$value = " $value\n";
+		}
+		$mods .= $value;
+	}
+	open(my $fh, '>', "$data_dir/$filename");
+	print $fh $mods;
+	close $fh;
 }
 sub system_data {
-    print "Collecting system data...\n";
-    my %data = (
-    'cc' => $ENV{'CC'},
-    # @(#)MIRBSD KSH R56 2018/03/09: ksh and mksh
-    'ksh-version' => system('echo -n $KSH_VERSION'), # shell, not env, variable
-    'manpath' => $ENV{'MANPATH'},
-    'path' => $ENV{'PATH'},
-    'xdg-config-home' => $ENV{'XDG_CONFIG_HOME'},
-    'xdg-config-dirs' => $ENV{'XDG_CONFIG_DIRS'},
-    'xdg-data-home' => $ENV{'XDG_DATA_HOME'},
-    'xdg-data-dirs' => $ENV{'XDG_DATA_DIRS'},
-    );
-    my @files = main::globber('/usr/bin/gcc*');
-    if (@files){
-        $data{'gcc-versions'} = join "\n",@files;
-    }
-    else {
-        $data{'gcc-versions'} = undef;
-    }
-    @files = main::globber('/sys/*');
-    if (@files){
-        $data{'sys-tree-ls-1-basic'} = join "\n", @files;
-    }
-    else {
-        $data{'sys-tree-ls-1-basic'} = undef;
-    }
-    write_data(\%data,'system');
-    # bsd tools http://cb.vu/unixtoolbox.xhtml
-    my @cmds = (
-    # general
-    ['sysctl', '-b kern.geom.conftxt'],
-    ['sysctl', '-b kern.geom.confxml'],
-    ['usbdevs','-v'],
-    # freebsd
-    ['pciconf','-l -cv'],
-    ['pciconf','-vl'],
-    ['pciconf','-l'],
-    # openbsd
-    ['pcidump',''],
-    ['pcidump','-v'],
-    # netbsd
-    ['kldstat',''],
-    ['pcictl','list'],
-    ['pcictl','list -ns'],
-    );
-    run_commands(\@cmds,'system-bsd');
-    # diskinfo -v <disk>
-    # fdisk <disk>
-    @cmds = (
-    ['clang','--version'],
-    ['dmidecode',''],
-    ['dmesg',''],
-    ['gcc','--version'],
-    ['hciconfig','-a'],
-    ['initctl','list'],
-    ['ipmi-sensors',''],
-    ['ipmi-sensors','--output-sensor-thresholds'],
-    ['ipmitool','sensor'],
-    ['lscpu',''],
-    ['lspci',''],
-    ['lspci','-k'],
-    ['lspci','-n'],
-    ['lspci','-nn'],
-    ['lspci','-nnk'],
-    ['lspci','-nnkv'],# returns ports
-    ['lspci','-nnv'],
-    ['lspci','-mm'],
-    ['lspci','-mmk'],
-    ['lspci','-mmkv'],
-    ['lspci','-mmv'],
-    ['lspci','-mmnn'],
-    ['lspci','-v'],
-    ['lsusb',''],
-    ['lsusb','-t'],
-    ['lsusb','-v'],
-    ['ps','aux'],
-    ['ps','-e'],
-    ['ps','-p 1'],
-    ['runlevel',''],
-    ['rc-status','-a'],
-    ['rc-status','-l'],
-    ['rc-status','-r'],
-    ['sensors',''],
-    # leaving this commented out to remind that some systems do not
-    # support strings --version, but will just simply hang at that command
-    # which you can duplicate by simply typing: strings then hitting enter.
-    # ['strings','--version'],
-    ['strings','present'],
-    ['sysctl','-a'],
-    ['systemctl','list-units'],
-    ['systemctl','list-units --type=target'],
-    ['systemd-detect-virt',''],
-    ['upower','-e'],
-    ['uptime',''],
-    ['vcgencmd','get_mem arm'],
-    ['vcgencmd','get_mem gpu'],
-    );
-    run_commands(\@cmds,'system');
-    @files = main::globber('/dev/bus/usb/*/*');
-    copy_files(\@files, 'system');
+	print "Collecting system data...\n";
+	# has to run here because if null, error, list constructor throws fatal error
+	my $ksh = qx(ksh -c 'printf \%s "\$KSH_VERSION"' 2>/dev/null);
+	my %data = (
+	'cc' => $ENV{'CC'},
+	# @(#)MIRBSD KSH R56 2018/03/09: ksh and mksh
+	'ksh-version' => $ksh, # shell, not env, variable
+	'manpath' => $ENV{'MANPATH'},
+	'path' => $ENV{'PATH'},
+	'xdg-config-home' => $ENV{'XDG_CONFIG_HOME'},
+	'xdg-config-dirs' => $ENV{'XDG_CONFIG_DIRS'},
+	'xdg-data-home' => $ENV{'XDG_DATA_HOME'},
+	'xdg-data-dirs' => $ENV{'XDG_DATA_DIRS'},
+	);
+	my @files = main::globber('/usr/bin/gcc*');
+	if (@files){
+		$data{'gcc-versions'} = join("\n", @files);
+	}
+	else {
+		$data{'gcc-versions'} = undef;
+	}
+	@files = main::globber('/sys/*');
+	if (@files){
+		$data{'sys-tree-ls-1-basic'} = join("\n", @files);
+	}
+	else {
+		$data{'sys-tree-ls-1-basic'} = undef;
+	}
+	write_data(\%data,'system');
+	# bsd tools http://cb.vu/unixtoolbox.xhtml
+	my @cmds = (
+	# general
+	['sysctl', '-a'],
+	['sysctl', '-b kern.geom.conftxt'],
+	['sysctl', '-b kern.geom.confxml'],
+	['usbdevs','-v'],
+	# freebsd
+	['ofwdump','-a'], # arm / soc
+	['ofwdump','-ar'], # arm / soc
+	['pciconf','-l -cv'],
+	['pciconf','-vl'],
+	['pciconf','-l'],
+	['usbconfig','dump_device_desc'],
+	['usbconfig','list'], # needs root, sigh... why?
+	# openbsd
+	['ofctl',''], # arm / soc, need to see data sample of this
+	['pcidump',''],
+	['pcidump','-v'],
+	# netbsd
+	['kldstat',''],
+	['pcictl','pci0 list'],
+	['pcictl','pci0 list -N'],
+	['pcictl','pci0 list -n'],
+	);
+	run_commands(\@cmds,'system-bsd');
+	# diskinfo -v <disk>
+	# fdisk <disk>
+	@cmds = (
+	['clang','--version'],
+	# only for prospective ram feature data collection: requires i2c-tools and module eeprom loaded
+	['decode-dimms',''], 
+	['dmidecode',''],
+	['dmesg',''],
+	['gcc','--version'],
+	['initctl','list'],
+	['ipmi-sensors',''],
+	['ipmi-sensors','--output-sensor-thresholds'],
+	['ipmitool','sensor'],
+	['lscpu',''],
+	['lspci',''],
+	['lspci','-k'],
+	['lspci','-n'],
+	['lspci','-nn'],
+	['lspci','-nnk'],
+	['lspci','-nnkv'],# returns ports
+	['lspci','-nnv'],
+	['lspci','-mm'],
+	['lspci','-mmk'],
+	['lspci','-mmkv'],
+	['lspci','-mmv'],
+	['lspci','-mmnn'],
+	['lspci','-v'],
+	['lsusb',''],
+	['lsusb','-t'],
+	['lsusb','-v'],
+	['ps','aux'],
+	['ps','-e'],
+	['ps','-p 1'],
+	['runlevel',''],
+	['rc-status','-a'],
+	['rc-status','-l'],
+	['rc-status','-r'],
+	['sensors',''],
+	['sensors','-j'],
+	['sensors','-u'],
+	# leaving this commented out to remind that some systems do not
+	# support strings --version, but will just simply hang at that command
+	# which you can duplicate by simply typing: strings then hitting enter.
+	# ['strings','--version'],
+	['strings','present'],
+	['sysctl','-a'],
+	['systemctl','list-units'],
+	['systemctl','list-units --type=target'],
+	['systemd-detect-virt',''],
+	['uname','-a'],
+	['upower','-e'],
+	['uptime',''],
+	['vcgencmd','get_mem arm'],
+	['vcgencmd','get_mem gpu'],
+	);
+	run_commands(\@cmds,'system');
+	@files = main::globber('/dev/bus/usb/*/*');
+	copy_files(\@files, 'system');
 }
 sub system_files {
-    print "Collecting system files data...\n";
-    my (%data,@files,@files2);
-    @files = RepoData::get($data_dir);
-    copy_files(\@files, 'repo');
-    # chdir "/etc";
-    @files = main::globber('/etc/*[-_]{[rR]elease,[vV]ersion,issue}*');
-    push (@files, '/etc/issue');
-    push (@files, '/etc/lsb-release');
-    push (@files, '/etc/os-release');
-    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',
-    '/proc/meminfo',
-    '/proc/modules',
-    '/proc/net/arp',
-    '/proc/version',
-    );
-    @files2=main::globber('/sys/class/power_supply/*/uevent');
-    if (@files2){
-        @files = (@files,@files2);
-    }
-    else {
-        push (@files, '/sys-class-power-supply-empty');
-    }
-    copy_files(\@files, 'system');
-    @files = (
-    '/etc/make.conf',
-    '/etc/src.conf',
-    '/var/run/dmesg.boot',
-    );
-    copy_files(\@files,'system-bsd');
-    @files = main::globber('/sys/devices/system/cpu/vulnerabilities/*');
-    copy_files(\@files,'security');
+	print "Collecting system files data...\n";
+	my (%data,@files,@files2);
+	@files = RepoItem::get($data_dir);
+	copy_files(\@files, 'repo');
+	# chdir "/etc";
+	@files = main::globber('/etc/*[-_]{[rR]elease,[vV]ersion,issue}*');
+	push(@files, '/etc/issue');
+	push(@files, '/etc/lsb-release');
+	push(@files, '/etc/os-release');
+	push(@files, '/system/build.prop');# android data file, requires rooted
+	push(@files, '/var/log/installer/oem-id'); # ubuntu only for oem installs?
+	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/cmdline',
+	'/proc/cpuinfo',
+	'/proc/meminfo',
+	'/proc/modules',
+	'/proc/net/arp',
+	'/proc/version',
+	);
+	@files2=main::globber('/sys/class/power_supply/*/uevent');
+	if (@files2){
+		push(@files,@files2);
+	}
+	else {
+		push(@files, '/sys-class-power-supply-empty');
+	}
+	copy_files(\@files, 'system');
+	@files = (
+	'/etc/make.conf',
+	'/etc/src.conf',
+	'/var/run/dmesg.boot',
+	);
+	copy_files(\@files,'system-bsd');
+	@files = main::globber('/sys/devices/system/cpu/vulnerabilities/*');
+	copy_files(\@files,'security');
 }
 ## SELF EXECUTE FOR LOG/OUTPUT
 sub run_self {
-    print "Creating $self_name output file now. This can take a few seconds...\n";
-    print "Starting $self_name from: $self_path\n";
-    my $i = ($option eq 'main-full')? ' -i' : '';
-    my $z = ($debugger{'z'}) ? ' -z' : '';
-    my $iz = "$i$z";
-    $iz =~ s/[\s\-]//g;
-    my $cmd = "$self_path/$self_name -FRfrploudmaxxx$i$z --usb --slots --debug 10 -y 120 > $data_dir/$self_name-FRfrploudmaxxx$iz-usb-slots-y120.txt 2>&1";
-    system($cmd);
-    copy($log_file, "$data_dir") or main::error_handler('copy-failed', "$log_file", "$!");
-    system("$self_path/$self_name --recommends -y 120 > $data_dir/$self_name-recommends-120.txt 2>&1");
+	print "Creating $self_name output file now. This can take a few seconds...\n";
+	print "Starting $self_name from: $self_path\n";
+	my $i = ($option eq 'main-full')? ' -i' : '';
+	my $z = ($debugger{'filter'}) ? ' -z' : '';
+	my $w = ($debugger{'width'}) ? $debugger{'width'} : 120;
+	my $iz = "$i$z";
+	$iz =~ s/[\s-]//g;
+	my $self_file = "$data_dir/$self_name-FERfJLrploudma$iz-slots-y$w.txt";
+	my $cmd = "$self_path/$self_name -FERfJLrploudma$i$z --slots --debug 10 -y $w > $self_file 2>&1";
+	system($cmd);
+	copy($log_file, "$data_dir") or main::error_handler('copy-failed', "$log_file", "$!");
+	system("$self_path/$self_name --recommends -y 120 > $data_dir/$self_name-recommends-120.txt 2>&1");
 }
 
 ## UTILITIES COPY/CMD/WRITE
 sub copy_files {
-    my ($files_ref,$type,$alt_dir) = @_;
-    my ($absent,$error,$good,$name,$unreadable);
-    my $directory = ($alt_dir) ? $alt_dir : $data_dir;
-    my $working = ($type ne 'proc') ? "$type-file-": '';
-    foreach (@$files_ref) {
-        $name = $_;
-        $name =~ s/^\///;
-        $name =~ s/\//~/g;
-        # print "$name\n" if $type eq 'proc';
-        $name = "$directory/$working$name";
-        $good = $name . '.txt';
-        $absent = $name . '-absent';
-        $error = $name . '-error';
-        $unreadable = $name . '-unreadable';
-        # proc have already been tested for readable/exists
-        if ($type eq 'proc' || -e $_ ) {
-            print "F:$_\n" if $type eq 'proc' && $debugger{'proc-print'};
-            if ($type eq 'proc' || -r $_){
-                copy($_,"$good") or main::toucher($error);
-            }
-            else {
-                main::toucher($unreadable);
-            }
-        }
-        else {
-            main::toucher($absent);
-        }
-    }
+	my ($files_ref,$type,$alt_dir) = @_;
+	my ($absent,$error,$good,$name,$unreadable);
+	my $directory = ($alt_dir) ? $alt_dir : $data_dir;
+	my $working = ($type ne 'proc') ? "$type-file-": '';
+	foreach (@$files_ref){
+		$name = $_;
+		$name =~ s/^\///;
+		$name =~ s/\//~/g;
+		# print "$name\n" if $type eq 'proc';
+		$name = "$directory/$working$name";
+		$good = $name . '.txt';
+		$absent = $name . '-absent';
+		$error = $name . '-error';
+		$unreadable = $name . '-unreadable';
+		# proc have already been tested for readable/exists
+		if ($type eq 'proc' || -e $_){
+			print "F:$_\n" if $type eq 'proc' && $debugger{'proc-print'};
+			if ($type eq 'proc' || -r $_){
+				copy($_,"$good") or main::toucher($error);
+			}
+			else {
+				main::toucher($unreadable);
+			}
+		}
+		else {
+			main::toucher($absent);
+		}
+	}
 }
 sub run_commands {
-    my ($cmds,$type) = @_;
-    my $holder = '';
-    my ($name,$cmd,$args);
-    foreach (@$cmds){
-        my @rows = @$_;
-        if (my $program = main::check_program($rows[0])){
-            if ($rows[1] eq 'present'){
-                $name = "$data_dir/$type-cmd-$rows[0]-present";
-                main::toucher($name);
-            }
-            else {
-                $args = $rows[1];
-                $args =~ s/\s|--|\/|=/-/g; # for:
-                $args =~ s/--/-/g;# strip out -- that result from the above
-                $args =~ s/^-//g;
-                $args = "-$args" if $args;
-                $name = "$data_dir/$type-cmd-$rows[0]$args.txt";
-                $cmd = "$program $rows[1] >$name 2>&1";
-                system($cmd);
-            }
-        }
-        else {
-            if ($holder ne $rows[0]){
-                $name = "$data_dir/$type-cmd-$rows[0]-absent";
-                main::toucher($name);
-                $holder = $rows[0];
-            }
-        }
-    }
+	my ($cmds,$type) = @_;
+	my $holder = '';
+	my ($name,$cmd,$args);
+	foreach my $rows (@$cmds){
+		if (my $program = main::check_program($rows->[0])){
+			if ($rows->[1] eq 'present'){
+				$name = "$data_dir/$type-cmd-$rows->[0]-present";
+				main::toucher($name);
+			}
+			else {
+				$args = $rows->[1];
+				$args =~ s/\s|--|\/|=/-/g; # for:
+				$args =~ s/--/-/g;# strip out -- that result from the above
+				$args =~ s/^-//g;
+				$args = "-$args" if $args;
+				$name = "$data_dir/$type-cmd-$rows->[0]$args.txt";
+				$cmd = "$program $rows->[1] >$name 2>&1";
+				system($cmd);
+			}
+		}
+		else {
+			if ($holder ne $rows->[0]){
+				$name = "$data_dir/$type-cmd-$rows->[0]-absent";
+				main::toucher($name);
+				$holder = $rows->[0];
+			}
+		}
+	}
 }
 sub write_data {
-    my ($data_ref, $type) = @_;
-    my ($empty,$error,$fh,$good,$name,$undefined,$value);
-    foreach (keys %$data_ref) {
-        $value = $$data_ref{$_};
-        $name = "$data_dir/$type-data-$_";
-        $good = $name . '.txt';
-        $empty = $name . '-empty';
-        $error = $name . '-error';
-        $undefined = $name . '-undefined';
-        if (defined $value) {
-            if ($value || $value eq '0'){
-                open($fh, '>', $good) or main::toucher($error);
-                print $fh "$value";
-            }
-            else {
-                main::toucher($empty);
-            }
-        }
-        else {
-            main::toucher($undefined);
-        }
-    }
+	my ($data_ref, $type) = @_;
+	my ($empty,$error,$fh,$good,$name,$undefined,$value);
+	foreach (keys %$data_ref){
+		$value = $data_ref->{$_};
+		$name = "$data_dir/$type-data-$_";
+		$good = $name . '.txt';
+		$empty = $name . '-empty';
+		$error = $name . '-error';
+		$undefined = $name . '-undefined';
+		if (defined $value){
+			if ($value || $value eq '0'){
+				open($fh, '>', $good) or main::toucher($error);
+				print $fh "$value";
+			}
+			else {
+				main::toucher($empty);
+			}
+		}
+		else {
+			main::toucher($undefined);
+		}
+	}
 }
 ## TOOLS FOR DIRECTORY TREE/LS/TRAVERSE; UPLOADER
 sub build_tree {
-    my ($which) = @_;
-    if ( $which eq 'sys' && main::check_program('tree') ){
-        print "Constructing /$which tree data...\n";
-        my $dirname = '/sys';
-        my $cmd;
-        system("tree -a -L 10 /sys > $data_dir/sys-data-tree-full-10.txt");
-        opendir my($dh), $dirname or main::error_handler('open-dir',"$dirname", "$!");
-        my @files = readdir $dh;
-        closedir $dh;
-        foreach (@files){
-            next if /^\./;
-            $cmd = "tree -a -L 10 $dirname/$_ > $data_dir/sys-data-tree-$_-10.txt";
-            #print "$cmd\n";
-            system($cmd);
-        }
-    }
-    print "Constructing /$which ls data...\n";
-    if ($which eq 'sys'){
-        directory_ls($which,1);
-        directory_ls($which,2);
-        directory_ls($which,3);
-        directory_ls($which,4);
-    }
-    elsif ($which eq 'proc') {
-        directory_ls('proc',1);
-        directory_ls('proc',2,'[a-z]');
-        # don't want the /proc/self or /proc/thread-self directories, those are 
-        # too invasive
-        #directory_ls('proc',3,'[a-z]');
-        #directory_ls('proc',4,'[a-z]');
-    }
+	my ($which) = @_;
+	if ($which eq 'sys' && main::check_program('tree')){
+		print "Constructing /$which tree data...\n";
+		my $dirname = '/sys';
+		my $cmd;
+		system("tree -a -L 10 /sys > $data_dir/sys-data-tree-full-10.txt");
+		opendir(my $dh, $dirname) or main::error_handler('open-dir',"$dirname", "$!");
+		my @files = readdir($dh);
+		closedir $dh;
+		foreach (@files){
+			next if /^\./;
+			$cmd = "tree -a -L 10 $dirname/$_ > $data_dir/sys-data-tree-$_-10.txt";
+			# print "$cmd\n";
+			system($cmd);
+		}
+	}
+	print "Constructing /$which ls data...\n";
+	if ($which eq 'sys'){
+		directory_ls($which,1);
+		directory_ls($which,2);
+		directory_ls($which,3);
+		directory_ls($which,4);
+	}
+	elsif ($which eq 'proc'){
+		directory_ls('proc',1);
+		directory_ls('proc',2,'[a-z]');
+		# don't want the /proc/self or /proc/thread-self directories, those are 
+		# too invasive
+		#directory_ls('proc',3,'[a-z]');
+		#directory_ls('proc',4,'[a-z]');
+	}
 }
 
 # include is basic regex for ls path syntax, like [a-z]
 sub directory_ls {
-    my ( $dir,$depth,$include) = @_;
-    $include ||= '';
-    my ($exclude) = ('');
-    # wd do NOT want to see anything in self or thread-self!!
-    # $exclude = 'I self -I thread-self' if $dir eq 'proc';
-    my $cmd = do {
-        if ( $depth == 1 ){ "ls -l $exclude /$dir/$include 2>/dev/null" }
-        elsif ( $depth == 2 ){ "ls -l $exclude /$dir/$include*/ 2>/dev/null" }
-        elsif ( $depth == 3 ){ "ls -l $exclude /$dir/$include*/*/ 2>/dev/null" }
-        elsif ( $depth == 4 ){ "ls -l $exclude /$dir/$include*/*/*/ 2>/dev/null" }
-        elsif ( $depth == 5 ){ "ls -l $exclude /$dir/$include*/*/*/*/ 2>/dev/null" }
-        elsif ( $depth == 6 ){ "ls -l $exclude /$dir/$include*/*/*/*/*/ 2>/dev/null" }
-    };
-    my @working = ();
-    my $output = '';
-    my ($type);
-    my $result = qx($cmd);
-    open my $ch, '<', \$result or main::error_handler('open-data',"$cmd", "$!");
-    while ( my $line = <$ch> ){
-        chomp($line);
-        $line =~ s/^\s+|\s+$//g;
-        @working = split /\s+/, $line;
-        $working[0] ||= '';
-        if ( scalar @working > 7 ){
-            if ($working[0] =~ /^d/ ){
-                $type = "d - ";
-            }
-            elsif ($working[0] =~ /^l/){
-                $type = "l - ";
-            }
-            else {
-                $type = "f - ";
-            }
-            $working[9] ||= '';
-            $working[10] ||= '';
-            $output = $output . "  $type$working[8] $working[9] $working[10]\n";
-        }
-        elsif ( $working[0] !~ /^total/ ){
-            $output = $output . $line . "\n";
-        }
-    }
-    close $ch;
-    my $file = "$data_dir/$dir-data-ls-$depth.txt";
-    open my $fh, '>', $file or main::error_handler('create',"$file", "$!");
-    print $fh $output;
-    close $fh;
-    # print "$output\n";
+	my ($dir,$depth,$include) = @_;
+	$include ||= '';
+	my ($exclude) = ('');
+	# wd do NOT want to see anything in self or thread-self!!
+	# $exclude = 'I self -I thread-self' if $dir eq 'proc';
+	my $cmd = do {
+		if ($depth == 1){ "ls -l $exclude /$dir/$include 2>/dev/null" }
+		elsif ($depth == 2){ "ls -l $exclude /$dir/$include*/ 2>/dev/null" }
+		elsif ($depth == 3){ "ls -l $exclude /$dir/$include*/*/ 2>/dev/null" }
+		elsif ($depth == 4){ "ls -l $exclude /$dir/$include*/*/*/ 2>/dev/null" }
+		elsif ($depth == 5){ "ls -l $exclude /$dir/$include*/*/*/*/ 2>/dev/null" }
+		elsif ($depth == 6){ "ls -l $exclude /$dir/$include*/*/*/*/*/ 2>/dev/null" }
+	};
+	my @working;
+	my $output = '';
+	my ($type);
+	my $result = qx($cmd);
+	open(my $ch, '<', \$result) or main::error_handler('open-data',"$cmd", "$!");
+	while (my $line = <$ch>){
+		chomp($line);
+		$line =~ s/^\s+|\s+$//g;
+		@working = split(/\s+/, $line);
+		$working[0] ||= '';
+		if (scalar @working > 7){
+			if ($working[0] =~ /^d/){
+				$type = "d - ";
+			}
+			elsif ($working[0] =~ /^l/){
+				$type = "l - ";
+			}
+			else {
+				$type = "f - ";
+			}
+			$working[9] ||= '';
+			$working[10] ||= '';
+			$output = $output . "  $type$working[8] $working[9] $working[10]\n";
+		}
+		elsif ($working[0] !~ /^total/){
+			$output = $output . $line . "\n";
+		}
+	}
+	close $ch;
+	my $file = "$data_dir/$dir-data-ls-$depth.txt";
+	open(my $fh, '>', $file) or main::error_handler('create',"$file", "$!");
+	print $fh $output;
+	close $fh;
+	# print "$output\n";
 }
 sub proc_traverse_data {
-    print "Building /proc file list...\n";
-    # get rid pointless error:Can't cd to (/sys/kernel/) debug: Permission denied
-    no warnings 'File::Find';
-    $parse_src = 'proc';
-    File::Find::find( \&wanted, "/proc");
-    proc_traverse_processor();
-    @content = ();
-}
-sub proc_traverse_processor {
-    my ($data,$fh,$result,$row,$sep);
-    my $proc_dir = "$data_dir/proc";
-    print "Adding /proc files...\n";
-    mkdir $proc_dir or main::error_handler('mkdir', "$proc_dir", "$!");
-    # @content = sort @content; 
-    copy_files(\@content,'proc',$proc_dir);
-#   foreach (@content){
-#       print "$_\n";
-#   }
+	print "Building /proc file list...\n";
+	# get rid pointless error:Can't cd to (/sys/kernel/) debug: Permission denied
+	#no warnings 'File::Find';
+	no warnings;
+	$parse_src = 'proc';
+	File::Find::find(\&wanted, "/proc");
+	process_proc_traverse();
+	@content = ();
+}
+sub process_proc_traverse {
+	my ($data,$fh,$result,$row,$sep);
+	my $proc_dir = "$data_dir/proc";
+	print "Adding /proc files...\n";
+	mkdir $proc_dir or main::error_handler('mkdir', "$proc_dir", "$!");
+	# @content = sort @content; 
+	copy_files(\@content,'proc',$proc_dir);
+# 	foreach (@content){print "$_\n";}
 }
 
 sub sys_traverse_data {
-    print "Building /sys file list...\n";
-    # get rid pointless error:Can't cd to (/sys/kernel/) debug: Permission denied
-    no warnings 'File::Find';
-    $parse_src = 'sys';
-    File::Find::find( \&wanted, "/sys");
-    sys_traverse_processsor();
-    @content = ();
-}
-sub sys_traverse_processsor {
-    my ($data,$fh,$result,$row,$sep);
-    my $filename = "sys-data-parse.txt";
-    print "Parsing /sys files...\n";
-    # no sorts, we want the order it comes in
-    # @content = sort @content; 
-    foreach (@content){
-        $data='';
-        $sep='';
-        my $b_fh = 1;
-        print "F:$_\n" if $debugger{'sys-print'};
-        open($fh, '<', $_) or $b_fh = 0;
-        # needed for removing -T test and root
-        if ($b_fh){
-            while ($row = <$fh>) {
-                chomp $row;
-                $data .= $sep . '"' . $row . '"';
-                $sep=', ';
-            }
-        }
-        else {
-            $data = '<unreadable>';
-        }
-        $result .= "$_:[$data]\n";
-        # print "$_:[$data]\n"
-    }
-    # print scalar @content . "\n";
-    open ($fh, '>', "$data_dir/$filename");
-    print $fh $result;
-    close $fh;
-    # print $fh "$result";
-}
-
+	print "Building /sys file list...\n";
+	# get rid pointless error:Can't cd to (/sys/kernel/) debug: Permission denied
+	#no warnings 'File::Find';
+	no warnings;
+	$parse_src = 'sys';
+	File::Find::find(\&wanted, "/sys");
+	process_sys_traverse();
+	@content = ();
+}
+sub process_sys_traverse {
+	my ($data,$fh,$result,$row,$sep);
+	my $filename = "sys-data-parse.txt";
+	print "Parsing /sys files...\n";
+	# no sorts, we want the order it comes in
+	# @content = sort @content; 
+	foreach (@content){
+		$data='';
+		$sep='';
+		my $b_fh = 1;
+		print "F:$_\n" if $debugger{'sys-print'};
+		open($fh, '<', $_) or $b_fh = 0;
+		# needed for removing -T test and root
+		if ($b_fh){
+			while ($row = <$fh>){
+				chomp($row);
+				$data .= $sep . '"' . $row . '"';
+				$sep=', ';
+			}
+		}
+		else {
+			$data = '<unreadable>';
+		}
+		$result .= "$_:[$data]\n";
+		# print "$_:[$data]\n"
+	}
+	# print scalar @content . "\n";
+	open($fh, '>', "$data_dir/$filename");
+	print $fh $result;
+	close $fh;
+	# print $fh "$result";
+}
+# perl compiler complains on start if prune = 1 used only once, so either 
+# do $File::Find::prune = 1 if !$File::Find::prune; OR use no warnings 'once'
 sub wanted {
-    return if -d; # not directory
-    return unless -e; # Must exist
-    return unless -f; # Must be file
-    return unless -r; # Must be readable
-    if ($parse_src eq 'sys'){
-        # note: a new file in 4.11 /sys can hang this, it is /parameter/ then
-        # a few variables. Since inxi does not need to see that file, we will
-        # not use it. Also do not need . files or __ starting files
-        # print $File::Find::name . "\n";
-        # block maybe: cfgroup\/
-        # picdec\/|, wait_for_fb_sleep/wake is an odroid thing caused hang
-        return if $File::Find::name =~ /(^\/sys\/power\/wait_for_fb)/;
-        return if $File::Find::name =~ /\/(\.[a-z]|kernel\/|trace\/|parameters\/|debug\/)/;
-        # comment this one out if you experience hangs or if 
-        # we discover syntax of foreign language characters
-        # Must be ascii like. This is questionable and might require further
-        # investigation, it is removing some characters that we might want
-        # NOTE: this made a bunch of files on arm systems unreadable so we handle 
-        # the readable tests in copy_files()
-        # return unless -T; 
-    }
-    elsif ($parse_src eq 'proc') {
-        return if $File::Find::name =~ /^\/proc\/[0-9]+\//;
-        return if $File::Find::name =~ /^\/proc\/bus\/pci\//;
-        return if $File::Find::name =~ /^\/proc\/(irq|spl|sys)\//;
-        # these choke on sudo/root: kmsg kcore kpage and we don't want keys or kallsyms
-        return if $File::Find::name =~ /^\/proc\/k/; 
-        return if $File::Find::name =~ /(\/mb_groups|debug)$/;
-    }
-    # print $File::Find::name . "\n";
-    push (@content, $File::Find::name);
-    return;
+	# note: we want these directories pruned before the -d test so find 
+	# doesn't try to read files inside of the directories
+	if ($parse_src eq 'proc'){
+		if ($File::Find::name =~ m!^/proc/[0-9]+! || 
+		 $File::Find::name =~ m!^/proc/(irq|spl|sys)! ||
+		 # these choke on sudo/root: kmsg kcore kpage and we don't want keys or kallsyms
+		 $File::Find::name =~ m!^/proc/k! ||
+		 $File::Find::name =~ m!^/proc/bus/pci! ||
+		 $File::Find::name =~ m!^/proc/(irq|spl|sys)!){
+			$File::Find::prune = 1;
+			return;
+		}
+	}
+	elsif ($parse_src eq 'sys'){
+		# note: a new file in 4.11 /sys can hang this, it is /parameter/ then
+		# a few variables. Since inxi does not need to see that file, we will
+		# not use it. 
+		if ($File::Find::name =~ m!/(kernel/|trace/|parameters|debug)!){
+			$File::Find::prune = 1;
+		}
+	}
+	return if -d; # not directory
+	return unless -e; # Must exist
+	return unless -f; # Must be file
+	return unless -r; # Must be readable
+	if ($parse_src eq 'sys'){
+		# print $File::Find::name . "\n";
+		# block maybe: cfgroup\/
+		# picdec\/|, wait_for_fb_sleep/wake is an odroid thing caused hang
+		# wakeup_count also fails for android, but works fine on regular systems
+		return if $b_arm && $File::Find::name =~ m!^/sys/power/(wait_for_fb_|wakeup_count$)!;
+		# do not need . files or __ starting files
+		return if $File::Find::name =~ m!/\.[a-z]!;
+		# pp_num_states: amdgpu driver bug; android: wakeup_count
+		return if $File::Find::name =~ m!/pp_num_states$!;
+		# comment this one out if you experience hangs or if 
+		# we discover syntax of foreign language characters
+		# Must be ascii like. This is questionable and might require further
+		# investigation, it is removing some characters that we might want
+		# NOTE: this made a bunch of files on arm systems unreadable so we handle 
+		# the readable tests in copy_files()
+		# return unless -T; 
+	}
+	elsif ($parse_src eq 'proc'){
+		return if $File::Find::name =~ m!(/mb_groups|debug)$!;
+	}
+	# print $File::Find::name . "\n";
+	push(@content, $File::Find::name);
+	return;
 }
 # args: 1 - path to file to be uploaded
 # args: 2 - optional: alternate ftp upload url
 # NOTE: must be in format: ftp.site.com/incoming
 sub upload_file {
-    require Net::FTP;
-    import Net::FTP;
-    my ($self, $ftp_url) = @_;
-    my ($ftp, $domain, $host, $user, $pass, $dir, $error);
-    $ftp_url ||= main::get_defaults('ftp-upload');
-    $ftp_url =~ s/\/$//g; # trim off trailing slash if present
-    my @url = split(/\//, $ftp_url);
-    my $file_path = "$user_data_dir/$debug_gz";
-    $host = $url[0];
-    $dir = $url[1];
-    $domain = $host;
-    $domain =~ s/^ftp\.//;
-    $user = "anonymous";
-    $pass = "anonymous\@$domain";
-    
-    print $line3;
-    print "Uploading to: $ftp_url\n";
-    # print "$host $domain $dir $user $pass\n";
-    print "File to be uploaded:\n$file_path\n";
-    
-    if ($host && ( $file_path && -e $file_path ) ){
-        # NOTE: important: must explicitly set to passive true/1
-        $ftp = Net::FTP->new($host, Debug => 0, Passive => 1) || main::error_handler('ftp-connect', $ftp->message);
-        $ftp->login($user, $pass) || main::error_handler('ftp-login', $ftp->message);
-        $ftp->binary();
-        $ftp->cwd($dir);
-        print "Connected to FTP server.\n";
-        $ftp->put($file_path) || main::error_handler('ftp-upload', $ftp->message);
-        $ftp->quit;
-        print "Uploaded file successfully!\n";
-        print $ftp->message;
-        if ($debugger{'gz'}){
-            print "Removing debugger gz file:\n$file_path\n";
-            unlink $file_path or main::error_handler('remove',"$file_path", "$!");
-            print "File removed.\n";
-        }
-        print "Debugger data generation and upload completed. Thank you for your help.\n";
-    }
-    else {
-        main::error_handler('ftp-bad-path', "$file_path");
-    }
+	my ($self, $ftp_url) = @_;
+	my ($ftp, $domain, $host, $user, $pass, $dir, $error);
+	$ftp_url ||= main::get_defaults('ftp-upload');
+	$ftp_url =~ s/\/$//g; # trim off trailing slash if present
+	my @url = split('/', $ftp_url);
+	my $file_path = "$user_data_dir/$debug_gz";
+	$host = $url[0];
+	$dir = $url[1];
+	$domain = $host;
+	$domain =~ s/^ftp\.//;
+	$user = "anonymous";
+	$pass = "anonymous\@$domain";
+	
+	print $line3;
+	print "Uploading to: $ftp_url\n";
+	# print "$host $domain $dir $user $pass\n";
+	print "File to be uploaded:\n$file_path\n";
+	
+	if ($host && ($file_path && -e $file_path)){
+		# NOTE: important: must explicitly set to passive true/1
+		$ftp = Net::FTP->new($host, Debug => 0, Passive => 1) || main::error_handler('ftp-connect', $ftp->message);
+		$ftp->login($user, $pass) || main::error_handler('ftp-login', $ftp->message);
+		$ftp->binary();
+		$ftp->cwd($dir);
+		print "Connected to FTP server.\n";
+		$ftp->put($file_path) || main::error_handler('ftp-upload', $ftp->message);
+		$ftp->quit;
+		print "Uploaded file successfully!\n";
+		print $ftp->message;
+		if ($debugger{'gz'}){
+			print "Removing debugger gz file:\n$file_path\n";
+			unlink $file_path or main::error_handler('remove',"$file_path", "$!");
+			print "File removed.\n";
+		}
+		print "Debugger data generation and upload completed. Thank you for your help.\n";
+	}
+	else {
+		main::error_handler('ftp-bad-path', "$file_path");
+	}
 }
 }
+
 # random tests for various issues
 sub user_debug_test_1 {
-#   open(my $duped, '>&', STDOUT);
-#   local *STDOUT = $duped;
-#   my $item = POSIX::strftime("%c", localtime);
-#   print "Testing character encoding handling. Perl IO data:\n";
-#   print(join(', ', PerlIO::get_layers(STDOUT)), "\n");
-#   print "Without binmode: ", $item,"\n";
-#   binmode STDOUT,":utf8";
-#   print "With binmode: ", $item,"\n";
-#   print "Perl IO data:\n";
-#   print(join(', ', PerlIO::get_layers(STDOUT)), "\n");
-#   close($duped);
+# 	open(my $duped, '>&', STDOUT);
+# 	local *STDOUT = $duped;
+# 	my $item = POSIX::strftime("%c", localtime);
+# 	print "Testing character encoding handling. Perl IO data:\n";
+# 	print(join(', ', PerlIO::get_layers(STDOUT)), "\n");
+# 	print "Without binmode: ", $item,"\n";
+# 	binmode STDOUT,":utf8";
+# 	print "With binmode: ", $item,"\n";
+# 	print "Perl IO data:\n";
+# 	print(join(', ', PerlIO::get_layers(STDOUT)), "\n");
+# 	close $duped;
+}
+
+# see docs/optimization.txt
+sub ram_use {
+    my ($name, $ref) = @_;
+    printf "%-25s %5d %5d\n", $name, size($ref), total_size($ref);
 }
 
 #### -------------------------------------------------------------------
@@ -2152,165 +2461,177 @@ sub user_debug_test_1 {
 #### -------------------------------------------------------------------
 
 sub download_file {
-    my ($type, $url, $file) = @_;
-    my ($cmd,$args,$timeout) = ('','','');
-    my $debug_data = '';
-    my $result = 1;
-    $dl{'no-ssl-opt'} ||= '';
-    $dl{'spider'} ||= '';
-    $file ||= 'N/A'; # to avoid debug error
-    if ( ! $dl{'dl'} ){
-        return 0;
-    }
-    if ($dl{'timeout'}){
-        $timeout = "$dl{'timeout'}$dl_timeout";
-    }
-    # print "$dl{'no-ssl-opt'}\n";
-    # print "$dl{'dl'}\n";
-    # tiny supports spider sort of
-    ## NOTE: 1 is success, 0 false for Perl
-    if ($dl{'dl'} eq 'tiny' ){
-        $cmd = "Using tiny: type: $type \nurl: $url \nfile: $file";
-        $result = get_file($type, $url, $file);
-        $debug_data = ($type ne 'stdout') ? $result : 'Success: stdout data not null.';
-    }
-    # But: 0 is success, and 1 is false for these
-    # when strings are returned, they will be taken as true
-    else {
-        if ($type eq 'stdout'){
-            $args = $dl{'stdout'};
-            $cmd = "$dl{'dl'} $dl{'no-ssl-opt'} $timeout $args $url $dl{'null'}";
-            $result = qx($cmd);
-            $debug_data = ($result) ? 'Success: stdout data not null.' : 'Download resulted in null data!';
-        }
-        elsif ($type eq 'file') {
-            $args = $dl{'file'};
-            $cmd = "$dl{'dl'} $dl{'no-ssl-opt'} $timeout $args $file $url $dl{'null'}";
-            system($cmd);
-            $result = ($?) ? 0 : 1; # reverse these into Perl t/f
-            $debug_data = $result;
-        }
-        elsif ( $dl{'dl'} eq 'wget' && $type eq 'spider'){
-            $cmd = "$dl{'dl'} $dl{'no-ssl-opt'} $timeout $dl{'spider'} $url";
-            system($cmd);
-            $result = ($?) ? 0 : 1; # reverse these into Perl t/f
-            $debug_data = $result;
-        }
-    }
-    print "-------\nDownloader Data:\n$cmd\nResult: $debug_data\n" if $test[1];
-    log_data('data',"$cmd\nResult: $result") if $b_log;
-    return $result;
+	my ($type, $url, $file,$ua) = @_;
+	my ($cmd,$args,$timeout) = ('','','');
+	my $debug_data = '';
+	my $result = 1;
+	$ua = ($ua && $dl{'ua'}) ? $dl{'ua'} . $ua : '';
+	$dl{'no-ssl-opt'} ||= '';
+	$dl{'spider'} ||= '';
+	$file ||= 'N/A'; # to avoid debug error
+	if (!$dl{'dl'}){
+		return 0;
+	}
+	if ($dl{'timeout'}){
+		$timeout = "$dl{'timeout'}$dl_timeout";
+	}
+	# print "$dl{'no-ssl-opt'}\n";
+	# print "$dl{'dl'}\n";
+	# tiny supports spider sort of
+	## NOTE: 1 is success, 0 false for Perl
+	if ($dl{'dl'} eq 'tiny'){
+		$cmd = "Using tiny: type: $type \nurl: $url \nfile: $file";
+		$result = get_file($type, $url, $file);
+		$debug_data = ($type ne 'stdout') ? $result : 'Success: stdout data not null.';
+	}
+	# But: 0 is success, and 1 is false for these
+	# when strings are returned, they will be taken as true
+	# urls must be " quoted in case special characters present
+	else {
+		if ($type eq 'stdout'){
+			$args = $dl{'stdout'};
+			$cmd = "$dl{'dl'} $dl{'no-ssl-opt'} $ua $timeout $args \"$url\" $dl{'null'}";
+			$result = qx($cmd);
+			$debug_data = ($result) ? 'Success: stdout data not null.' : 'Download resulted in null data!';
+		}
+		elsif ($type eq 'file'){
+			$args = $dl{'file'};
+			$cmd = "$dl{'dl'} $dl{'no-ssl-opt'} $ua $timeout $args $file \"$url\" $dl{'null'}";
+			system($cmd);
+			$result = ($?) ? 0 : 1; # reverse these into Perl t/f
+			$debug_data = $result;
+		}
+		elsif ($dl{'dl'} eq 'wget' && $type eq 'spider'){
+			$cmd = "$dl{'dl'} $dl{'no-ssl-opt'} $ua $timeout $dl{'spider'} \"$url\"";
+			system($cmd);
+			$result = ($?) ? 0 : 1; # reverse these into Perl t/f
+			$debug_data = $result;
+		}
+	}
+	print "-------\nDownloader Data:\n$cmd\nResult: $debug_data\n" if $dbg[1];
+	log_data('data',"$cmd\nResult: $result") if $b_log;
+	return $result;
 }
 
 sub get_file {
-    my ($type, $url, $file) = @_;
-    my $response = HTTP::Tiny->new->get($url);
-    my $return = 1;
-    my $debug = 0;
-    my $fh;
-    $file ||= 'N/A';
-    log_data('dump','%{$response}',\%{$response}) if $b_log;
-    # print Dumper \%{$response};
-    if ( ! $response->{success} ){
-        my $content = $response->{content};
-        $content ||= "N/A\n";
-        my $msg = "Failed to connect to server/file!\n";
-        $msg .= "Response: ${content}Downloader: HTTP::Tiny URL: $url\nFile: $file";
-        log_data('data',$msg) if $b_log;
-        print error_defaults('download-error',$msg) if $test[1];
-        $return = 0;
-    }
-    else {
-        if ( $debug ){
-            print "$response->{success}\n";
-            print "$response->{status} $response->{reason}\n";
-            while (my ($key, $value) = each %{$response->{headers}}) {
-                for (ref $value eq "ARRAY" ? @$value : $value) {
-                    print "$key: $_\n";
-                }
-            }
-        }
-        if ( $type eq "stdout" || $type eq "ua-stdout" ){
-            $return = $response->{content};
-        }
-        elsif ($type eq "spider"){
-            # do nothing, just use the return value
-        }
-        elsif ($type eq "file"){
-            open($fh, ">", $file);
-            print $fh $response->{content}; # or die "can't write to file!\n";
-            close $fh;
-        }
-    }
-    return $return;
+	my ($type, $url, $file) = @_;
+	my $tiny = HTTP::Tiny->new;
+	# note: default is no verify, so default here actually is to verify unless overridden
+	$tiny->verify_SSL => 1 if !$dl{'no-ssl-opt'};
+	my $response = $tiny->get($url);
+	my $return = 1;
+	my $debug = 0;
+	my $fh;
+	$file ||= 'N/A';
+	log_data('dump','%{$response}',$response) if $b_log;
+	# print Dumper $response;
+	if (!$response->{'success'}){
+		my $content = $response->{'content'};
+		$content ||= "N/A\n";
+		my $msg = "Failed to connect to server/file!\n";
+		$msg .= "Response: ${content}Downloader: HTTP::Tiny URL: $url\nFile: $file";
+		log_data('data',$msg) if $b_log;
+		print error_defaults('download-error',$msg) if $dbg[1];
+		$return = 0;
+	}
+	else {
+		if ($debug){
+			print "$response->{success}\n";
+			print "$response->{status} $response->{reason}\n";
+			while (my ($key, $value) = each %{$response->{'headers'}}){
+				for (ref $value eq "ARRAY" ? @$value : $value){
+					print "$key: $_\n";
+				}
+			}
+		}
+		if ($type eq "stdout" || $type eq "ua-stdout"){
+			$return = $response->{'content'};
+		}
+		elsif ($type eq "spider"){
+			# do nothing, just use the return value
+		}
+		elsif ($type eq "file"){
+			open($fh, ">", $file);
+			print $fh $response->{'content'}; # or die "can't write to file!\n";
+			close $fh;
+		}
+	}
+	return $return;
 }
 
 sub set_downloader {
-    eval $start if $b_log;
-    $dl{'no-ssl'} = '';
-    $dl{'null'} = '';
-    $dl{'spider'} = '';
-    # we only want to use HTTP::Tiny if it's present in user system.
-    # It is NOT part of core modules. IO::Socket::SSL is also required 
-    # For some https connections so only use tiny as option if both present
-    if ($dl{'tiny'}){
-        if (check_module('HTTP::Tiny') && check_module('IO::Socket::SSL')){
-            import HTTP::Tiny;
-            import IO::Socket::SSL;
-            $dl{'tiny'} = 1;
-        }
-        else {
-            $dl{'tiny'} = 0;
-        }
-    }
-    #print $dl{'tiny'} . "\n";
-    if ($dl{'tiny'}){
-        $dl{'dl'} = 'tiny';
-        $dl{'file'} = '';
-        $dl{'stdout'} = '';
-        $dl{'timeout'} = '';
-    }
-    elsif ( $dl{'curl'} && check_program('curl')  ){
-        $dl{'dl'} = 'curl';
-        $dl{'file'} = '  -L -s -o ';
-        $dl{'no-ssl'} = ' --insecure';
-        $dl{'stdout'} = ' -L -s ';
-        $dl{'timeout'} = ' -y ';
-    }
-    elsif ($dl{'wget'} && check_program('wget') ){
-        $dl{'dl'} = 'wget';
-        $dl{'file'} = ' -q -O ';
-        $dl{'no-ssl'} = ' --no-check-certificate';
-        $dl{'spider'} = ' -q --spider';
-        $dl{'stdout'} = '  -q -O -';
-        $dl{'timeout'} = ' -T ';
-    }
-    elsif ($dl{'fetch'} && check_program('fetch')){
-        $dl{'dl'} = 'fetch';
-        $dl{'file'} = ' -q -o ';
-        $dl{'no-ssl'} = ' --no-verify-peer';
-        $dl{'stdout'} = ' -q -o -';
-        $dl{'timeout'} = ' -T ';
-    }
-    elsif ( $bsd_type eq 'openbsd' && check_program('ftp') ){
-        $dl{'dl'} = 'ftp';
-        $dl{'file'} = ' -o ';
-        $dl{'null'} = ' 2>/dev/null';
-        $dl{'stdout'} = ' -o - ';
-        $dl{'timeout'} = '';
-    }
-    else {
-        $dl{'dl'} = '';
-    }
-    # no-ssl-opt is set to 1 with --no-ssl, so it is true, then assign
-    $dl{'no-ssl-opt'} = $dl{'no-ssl'} if $dl{'no-ssl-opt'};
-    eval $end if $b_log;
+	eval $start if $b_log;
+	my $quiet = '';
+	$dl{'no-ssl'} = '';
+	$dl{'null'} = '';
+	$dl{'spider'} = '';
+	# we only want to use HTTP::Tiny if it's present in user system.
+	# It is NOT part of core modules. IO::Socket::SSL is also required 
+	# For some https connections so only use tiny as option if both present
+	if ($dl{'tiny'}){
+		if (check_perl_module('HTTP::Tiny') && check_perl_module('IO::Socket::SSL')){
+			HTTP::Tiny->import;
+			IO::Socket::SSL->import;
+			$dl{'tiny'} = 1;
+		}
+		else {
+			$dl{'tiny'} = 0;
+		}
+	}
+	# print $dl{'tiny'} . "\n";
+	if ($dl{'tiny'}){
+		$dl{'dl'} = 'tiny';
+		$dl{'file'} = '';
+		$dl{'stdout'} = '';
+		$dl{'timeout'} = '';
+	}
+	elsif ($dl{'curl'} && check_program('curl')){
+		$quiet = '-s ' if !$dbg[1];
+		$dl{'dl'} = 'curl';
+		$dl{'file'} = "  -L ${quiet}-o ";
+		$dl{'no-ssl'} = ' --insecure';
+		$dl{'stdout'} = " -L ${quiet}";
+		$dl{'timeout'} = ' -y ';
+		$dl{'ua'} = ' -A ' . $dl_ua;
+	}
+	elsif ($dl{'wget'} && check_program('wget')){
+		$quiet = '-q ' if !$dbg[1];
+		$dl{'dl'} = 'wget';
+		$dl{'file'} = " ${quiet}-O ";
+		$dl{'no-ssl'} = ' --no-check-certificate';
+		$dl{'spider'} = " ${quiet}--spider";
+		$dl{'stdout'} = " $quiet -O -";
+		$dl{'timeout'} = ' -T ';
+		$dl{'ua'} = ' -U ' . $dl_ua;
+	}
+	elsif ($dl{'fetch'} && check_program('fetch')){
+		$quiet = '-q ' if !$dbg[1];
+		$dl{'dl'} = 'fetch';
+		$dl{'file'} = " ${quiet}-o ";
+		$dl{'no-ssl'} = ' --no-verify-peer';
+		$dl{'stdout'} = " ${quiet}-o -";
+		$dl{'timeout'} = ' -T ';
+	}
+	# at least openbsd/netbsd
+	elsif ($bsd_type && check_program('ftp')){
+		$dl{'dl'} = 'ftp';
+		$dl{'file'} = ' -o ';
+		$dl{'null'} = ' 2>/dev/null';
+		$dl{'stdout'} = ' -o - ';
+		$dl{'timeout'} = '';
+	}
+	else {
+		$dl{'dl'} = '';
+	}
+	# no-ssl-opt is set to 1 with --no-ssl, so it is true, then assign
+	$dl{'no-ssl-opt'} = $dl{'no-ssl'} if $dl{'no-ssl-opt'};
+	eval $end if $b_log;
 }
 
 sub set_perl_downloader {
-    my ($downloader) = @_;
-    $downloader =~ s/perl/tiny/;
-    return $downloader;
+	my ($downloader) = @_;
+	$downloader =~ s/perl/tiny/;
+	return $downloader;
 }
 
 #### -------------------------------------------------------------------
@@ -2318,97 +2639,97 @@ sub set_perl_downloader {
 #### -------------------------------------------------------------------
 
 sub error_handler {
-    eval $start if $b_log;
-    my ( $err, $one, $two) = @_;
-    my ($b_help,$b_recommends);
-    my ($b_exit,$errno) = (1,0);
-    my $message = do {
-        if ( $err eq 'empty' ) { 'empty value' }
-        ## Basic rules
-        elsif ( $err eq 'not-in-irc' ) { 
-            $errno=1; "You can't run option $one in an IRC client!" }
-        ## Internal/external options
-        elsif ( $err eq 'bad-arg' ) { 
-            $errno=10; $b_help=1; "Unsupported value: $two for option: $one" }
-        elsif ( $err eq 'bad-arg-int' ) { 
-            $errno=11; "Bad internal argument: $one" }
-        elsif ( $err eq 'distro-block' ) { 
-            $errno=20; "Option: $one has been disabled by the $self_name distribution maintainer." }
-        elsif ( $err eq 'option-feature-incomplete' ) { 
-            $errno=21; "Option: '$one' feature: '$two' has not been implemented yet." }
-        elsif ( $err eq 'unknown-option' ) { 
-            $errno=22; $b_help=1; "Unsupported option: $one" }
-        ## Data
-        elsif ( $err eq 'open-data' ) { 
-            $errno=32; "Error opening data for reading: $one \nError: $two" }
-        elsif ( $err eq 'download-error' ) { 
-            $errno=33; "Error downloading file with $dl{'dl'}: $one \nError: $two" }
-        ## Files:
-        elsif ( $err eq 'copy-failed' ) { 
-            $errno=40; "Error copying file: $one \nError: $two" }
-        elsif ( $err eq 'create' ) { 
-            $errno=41; "Error creating file: $one \nError: $two" }
-        elsif ( $err eq 'downloader-error' ) { 
-            $errno=42; "Error downloading file: $one \nfor download source: $two" }
-        elsif ( $err eq 'file-corrupt' ) { 
-            $errno=43; "Downloaded file is corrupted: $one" }
-        elsif ( $err eq 'mkdir' ) { 
-            $errno=44; "Error creating directory: $one \nError: $two" }
-        elsif ( $err eq 'open' ) { 
-            $errno=45; $b_exit=0; "Error opening file: $one \nError: $two" }
-        elsif ( $err eq 'open-dir' ) { 
-            $errno=46; "Error opening directory: $one \nError: $two" }
-        elsif ( $err eq 'output-file-bad' ) { 
-            $errno=47; "Value for --output-file must be full path, a writable directory, \nand include file name. Path: $two" }
-        elsif ( $err eq 'not-writable' ) { 
-            $errno=48; "The file: $one is not writable!" }
-        elsif ( $err eq 'open-dir-failed' ) { 
-            $errno=49; "The directory: $one failed to open with error: $two" }
-        elsif ( $err eq 'remove' ) { 
-            $errno=50; "Failed to remove file: $one Error: $two" }
-        elsif ( $err eq 'rename' ) { 
-            $errno=51; "There was an error moving files: $one\nError: $two" }
-        elsif ( $err eq 'write' ) { 
-            $errno=52; "Failed writing file: $one - Error: $two!" }
-        ## Downloaders
-        elsif ( $err eq 'missing-downloader' ) { 
-            $errno=60; "Downloader program $two could not be located on your system." }
-        elsif ( $err eq 'missing-perl-downloader' ) { 
-            $errno=61; $b_recommends=1; "Perl downloader missing required module." }
-        ## FTP
-        elsif ( $err eq 'ftp-bad-path' ) { 
-            $errno=70; "Unable to locate for FTP upload file:\n$one" }
-        elsif ( $err eq 'ftp-connect' ) { 
-            $errno=71; "There was an error with connection to ftp server: $one" }
-        elsif ( $err eq 'ftp-login' ) { 
-            $errno=72; "There was an error with login to ftp server: $one" }
-        elsif ( $err eq 'ftp-upload' ) { 
-            $errno=73; "There was an error with upload to ftp server: $one" }
-        ## Modules
-        elsif ( $err eq 'required-module' ) { 
-            $errno=80; $b_recommends=1; "The required $one Perl module is not installed:\n$two" }
-        ## DEFAULT
-        else {
-            $errno=255; "Error handler ERROR!! Unsupported options: $err!"}
-    };
-    print_line("Error $errno: $message\n");
-    if ($b_help){
-        print_line("Check -h for correct parameters.\n");
-    }
-    if ($b_recommends){
-        print_line("See --recommends for more information.\n");
-    }
-    eval $end if $b_log;
-    exit $errno if $b_exit && !$debugger{'no-exit'};
+	eval $start if $b_log;
+	my ($err,$one,$two) = @_;
+	my ($b_help,$b_recommends);
+	my ($b_exit,$errno) = (1,0);
+	my $message = do {
+		if ($err eq 'empty'){ 'empty value' }
+		## Basic rules
+		elsif ($err eq 'not-in-irc'){ 
+			$errno=1; "You can't run option $one in an IRC client!" }
+		## Internal/external options
+		elsif ($err eq 'bad-arg'){ 
+			$errno=10; $b_help=1; "Unsupported value: $two for option: $one" }
+		elsif ($err eq 'bad-arg-int'){ 
+			$errno=11; "Bad internal argument: $one" }
+		elsif ($err eq 'distro-block'){ 
+			$errno=20; "Option: $one has been disabled by the $self_name distribution maintainer." }
+		elsif ($err eq 'option-feature-incomplete'){ 
+			$errno=21; "Option: '$one' feature: '$two' has not been implemented yet." }
+		elsif ($err eq 'unknown-option'){ 
+			$errno=22; $b_help=1; "Unsupported option: $one" }
+		## Data
+		elsif ($err eq 'open-data'){ 
+			$errno=32; "Error opening data for reading: $one \nError: $two" }
+		elsif ($err eq 'download-error'){ 
+			$errno=33; "Error downloading file with $dl{'dl'}: $one \nError: $two" }
+		## Files:
+		elsif ($err eq 'copy-failed'){ 
+			$errno=40; "Error copying file: $one \nError: $two" }
+		elsif ($err eq 'create'){ 
+			$errno=41; "Error creating file: $one \nError: $two" }
+		elsif ($err eq 'downloader-error'){ 
+			$errno=42; "Error downloading file: $one \nfor download source: $two" }
+		elsif ($err eq 'file-corrupt'){ 
+			$errno=43; "Downloaded file is corrupted: $one" }
+		elsif ($err eq 'mkdir'){ 
+			$errno=44; "Error creating directory: $one \nError: $two" }
+		elsif ($err eq 'open'){ 
+			$errno=45; $b_exit=0; "Error opening file: $one \nError: $two" }
+		elsif ($err eq 'open-dir'){ 
+			$errno=46; "Error opening directory: $one \nError: $two" }
+		elsif ($err eq 'output-file-bad'){ 
+			$errno=47; "Value for --output-file must be full path, a writable directory, \nand include file name. Path: $two" }
+		elsif ($err eq 'not-writable'){ 
+			$errno=48; "The file: $one is not writable!" }
+		elsif ($err eq 'open-dir-failed'){ 
+			$errno=49; "The directory: $one failed to open with error: $two" }
+		elsif ($err eq 'remove'){ 
+			$errno=50; "Failed to remove file: $one Error: $two" }
+		elsif ($err eq 'rename'){ 
+			$errno=51; "There was an error moving files: $one\nError: $two" }
+		elsif ($err eq 'write'){ 
+			$errno=52; "Failed writing file: $one - Error: $two!" }
+		## Downloaders
+		elsif ($err eq 'missing-downloader'){ 
+			$errno=60; "Downloader program $two could not be located on your system." }
+		elsif ($err eq 'missing-perl-downloader'){ 
+			$errno=61; $b_recommends=1; "Perl downloader missing required module." }
+		## FTP
+		elsif ($err eq 'ftp-bad-path'){ 
+			$errno=70; "Unable to locate for FTP upload file:\n$one" }
+		elsif ($err eq 'ftp-connect'){ 
+			$errno=71; "There was an error with connection to ftp server: $one" }
+		elsif ($err eq 'ftp-login'){ 
+			$errno=72; "There was an error with login to ftp server: $one" }
+		elsif ($err eq 'ftp-upload'){ 
+			$errno=73; "There was an error with upload to ftp server: $one" }
+		## Modules
+		elsif ($err eq 'required-module'){ 
+			$errno=80; $b_recommends=1; "The required $one Perl module is not installed:\n$two" }
+		## DEFAULT
+		else {
+			$errno=255; "Error handler ERROR!! Unsupported options: $err!"}
+	};
+	print_line("Error $errno: $message\n");
+	if ($b_help){
+		print_line("Check -h for correct parameters.\n");
+	}
+	if ($b_recommends){
+		print_line("See --recommends for more information.\n");
+	}
+	eval $end if $b_log;
+	exit $errno if $b_exit && !$debugger{'no-exit'};
 }
 
 sub error_defaults {
-    my ($type,$one) = @_;
-    $one ||= '';
-    my %errors = (
-    'download-error' => "Download Failure:\n$one\n",
-    );
-    return $errors{$type};
+	my ($type,$one) = @_;
+	$one ||= '';
+	my %errors = (
+	'download-error' => "Download Failure:\n$one\n",
+	);
+	return $errors{$type};
 }
 
 #### -------------------------------------------------------------------
@@ -2418,615 +2739,756 @@ sub error_defaults {
 ## CheckRecommends
 {
 package CheckRecommends;
+my (@modules);
 sub run {
-    main::error_handler('not-in-irc', 'recommends') if $b_irc;
-    my (@data,@rows);
-    my $line = make_line();
-    my $pm = get_pm();
-    @data = basic_data($line);
-    push @rows,@data;
-    if (!$bsd_type){
-        @data = check_items('required system directories',$line,$pm);
-        push @rows,@data;
-    }
-    @data = check_items('recommended system programs',$line,$pm);
-    push @rows,@data;
-    @data = check_items('recommended display information programs',$line,$pm);
-    push @rows,@data;
-    @data = check_items('recommended downloader programs',$line,$pm);
-    push @rows,@data;
-    @data = check_items('recommended Perl modules',$line,$pm);
-    push @rows,@data;
-    @data = check_items('recommended directories',$line,'');
-    push @rows,@data;
-    @data = check_items('recommended files',$line,'');
-    push @rows,@data;
-    @data = (
-    ['0', '', '', "$line"],
-    ['0', '', '', "Ok, all done with the checks. Have a nice day."],
-    ['0', '', '', " "],
-    );
-    push @rows,@data;
-    #print Data::Dumper::Dumper \@rows;
-    main::print_basic(@rows); 
-    exit 0; # shell true
+	main::error_handler('not-in-irc', 'recommends') if $b_irc;
+	my (@data,@rows);
+	my $line = make_line();
+	my $pm = get_pm();
+	@data = basic_data($line,$pm);
+	push(@rows, @data);
+	if (!$bsd_type){
+		@data = check_items('required system directories',$line,$pm);
+		push(@rows, @data);
+	}
+	@data = check_items('recommended system programs',$line,$pm);
+	push(@rows, @data);
+	@data = check_items('recommended display information programs',$line,$pm);
+	push(@rows, @data);
+	@data = check_items('recommended downloader programs',$line,$pm);
+	push(@rows, @data);
+	if (!$bsd_type){
+		@data = check_items('recommended kernel modules',$line,$pm);
+		push(@rows, @data);
+	}
+	@data = check_items('recommended Perl modules',$line,$pm);
+	push(@rows, @data);
+	@data = check_items('recommended directories',$line,'');
+	push(@rows, @data);
+	@data = check_items('recommended files',$line,'');
+	push(@rows, @data);
+	@data = (
+	['0', '', '', "$line"],
+	['0', '', '', "Ok, all done with the checks. Have a nice day."],
+	['0', '', '', " "],
+	);
+	push(@rows, @data);
+	# print Data::Dumper::Dumper \@rows;
+	main::print_basic(\@rows); 
+	exit 0; # shell true
 }
 
 sub basic_data {
-    my ($line) = @_;
-    my (@data,@rows);
-    my $client = $client{'name-print'};
-    $client .= ' ' . $client{'version'} if $client{'version'};
-    my $default_shell = 'N/A';
-    if ($ENV{'SHELL'}){
-        $default_shell = $ENV{'SHELL'};
-        $default_shell =~ s/.*\///;
-    }
-    my $sh = main::check_program('sh');
-    my $sh_real = Cwd::abs_path($sh);
-    @rows = (
-    ['0', '', '', "$self_name will now begin checking for the programs it needs 
-    to operate."],
-    ['0', '', '', "" ],
-    ['0', '', '', "Check $self_name --help or the man page (man $self_name) 
-    to see what options are available." ],
-    ['0', '', '', "$line" ],
-    ['0', '', '', "Test: core tools:" ],
-    ['0', '', '', "" ],
-    ['0', '', '', "Perl version: ^$]" ],
-    ['0', '', '', "Current shell: " . $client ],
-    ['0', '', '', "Default shell: " . $default_shell ],
-    ['0', '', '', "sh links to: $sh_real" ],
-    );
-    return @rows;
+	my ($line,$pm_local) = @_;
+	my (@data,@rows);
+	my $client = $client{'name-print'};
+	$pm_local ||= 'N/A';
+	$client .= ' ' . $client{'version'} if $client{'version'};
+	my $default_shell = 'N/A';
+	if ($ENV{'SHELL'}){
+		$default_shell = $ENV{'SHELL'};
+		$default_shell =~ s/.*\///;
+	}
+	my $sh = main::check_program('sh');
+	my $sh_real = Cwd::abs_path($sh);
+	@rows = (
+	['0', '', '', "$self_name will now begin checking for the programs it needs 
+	to operate."],
+	['0', '', '', "" ],
+	['0', '', '', "Check $self_name --help or the man page (man $self_name) 
+	to see what options are available." ],
+	['0', '', '', "$line" ],
+	['0', '', '', "Test: core tools:" ],
+	['0', '', '', "" ],
+	['0', '', '', "Perl version: ^$]" ],
+	['0', '', '', "Current shell: " . $client ],
+	['0', '', '', "Default shell: " . $default_shell ],
+	['0', '', '', "sh links to: $sh_real" ],
+	['0', '', '', "Package manager: $pm_local" ],
+	);
+	return @rows;
 }
 sub check_items {
-    my ($type,$line,$pm) = @_;
-    my (@data,%info,@missing,$row,@rows,$result,@unreadable);
-    my ($b_dir,$b_file,$b_module,$b_program,$item);
-    my ($about,$extra,$extra2,$extra3,$extra4,$info_os,$install) = ('','','','','','info','');
-    if ($type eq 'required system directories'){
-        @data = qw(/proc /sys);
-        $b_dir = 1;
-        $item = 'Directory';
-    }
-    elsif ($type eq 'recommended system programs'){
-        if ($bsd_type){
-            @data = qw(camcontrol dig dmidecode fdisk file glabel gpart ifconfig ipmi-sensors 
-            ipmitool lsusb sudo smartctl sysctl tree upower uptime usbdevs);
-            $info_os = 'info-bsd';
-        }
-        else {
-            @data = qw(blockdev dig dmidecode fdisk file hddtemp ifconfig ip ipmitool 
-            ipmi-sensors lsblk lsusb modinfo runlevel sensors strings sudo tree upower uptime);
-        }
-        $b_program = 1;
-        $item = 'Program';
-        $extra2 = "Note: IPMI sensors are generally only found on servers. To access 
-        that data, you only need one of the ipmi items.";
-    }
-    elsif ($type eq 'recommended display information programs'){