diff --git a/inxi b/inxi index 28771c1..c48df72 100755 --- a/inxi +++ b/inxi @@ -2777,412 +2777,411 @@ sub item_data { my ($type) = @_; my %data = ( # Directory Data - '/sys/class/dmi/id' => ({ + '/sys/class/dmi/id' => { 'info' => '-M system, motherboard, bios', - }), - '/dev' => ({ + }, + '/dev' => { 'info' => '-l,-u,-o,-p,-P,-D disk partition data', - }), - '/dev/disk/by-id' => ({ + }, + '/dev/disk/by-id' => { 'info' => '-D serial numbers', - }), - '/dev/disk/by-path' => ({ + }, + '/dev/disk/by-path' => { 'info' => '-D extra data', - }), - '/dev/disk/by-label' => ({ + }, + '/dev/disk/by-label' => { 'info' => '-l,-o,-p,-P partition labels', - }), - '/dev/disk/by-uuid' => ({ + }, + '/dev/disk/by-uuid' => { 'info' => '-u,-o,-p,-P partition uuid', - }), - '/proc' => ({ + }, + '/proc' => { 'info' => '', - }), - '/sys' => ({ + }, + '/sys' => { 'info' => '', - }), + }, # File Data - '/etc/lsb-release' => ({ + '/etc/lsb-release' => { 'info' => '-S distro version data (older version)', - }), - '/etc/os-release' => ({ + }, + '/etc/os-release' => { 'info' => '-S distro version data (newer version)', - }), - '/proc/asound/cards' => ({ + }, + '/proc/asound/cards' => { 'info' => '-A sound card data', - }), - '/proc/asound/version' => ({ + }, + '/proc/asound/version' => { 'info' => '-A ALSA data', - }), - '/proc/cpuinfo' => ({ + }, + '/proc/cpuinfo' => { 'info' => '-C cpu data', - }), - '/proc/mdstat' => ({ + }, + '/proc/mdstat' => { 'info' => '-R mdraid data (if you use dm-raid)', - }), - '/proc/meminfo' => ({ + }, + '/proc/meminfo' => { 'info' => '-I,-tm, -m memory data', - }), - '/proc/modules' => ({ + }, + '/proc/modules' => { 'info' => '-G module data (sometimes)', - }), - '/proc/mounts' => ({ + }, + '/proc/mounts' => { 'info' => '-P,-p partition advanced data', - }), - '/proc/scsi/scsi' => ({ + }, + '/proc/scsi/scsi' => { 'info' => '-D Advanced hard disk data (used rarely)', - }), - '/var/log/Xorg.0.log' => ({ + }, + '/var/log/Xorg.0.log' => { 'info' => '-G graphics driver load status', - }), - '/var/run/dmesg.boot' => ({ + }, + '/var/run/dmesg.boot' => { 'info' => '-D,-d disk data', - }), + }, ## START PACKAGE MANAGER BLOCK ## # Note: see inxi-perl branch for details: docs/recommends-package-manager.txt # System Tools - 'blockdev' => ({ + 'blockdev' => { 'info' => '--admin -p/-P (filesystem blocksize)', 'info-bsd' => '', 'apt' => 'util-linux', 'pacman' => 'util-linux', 'rpm' => 'util-linux', - }), - 'curl' => ({ + }, + 'curl' => { 'info' => '-i (if no dig); -w,-W; -U', 'info-bsd' => '-i (if no dig); -w,-W; -U', 'apt' => 'curl', 'pacman' => 'curl', 'rpm' => 'curl', - }), - 'camcontrol' => ({ + }, + 'camcontrol' => { 'info' => '', 'info-bsd' => '-R; -D; -P. Get actual gptid /dev path', 'apt' => '', 'pacman' => '', 'rpm' => '', - }), - 'dig' => ({ + }, + 'dig' => { 'info' => '-i wlan IP', 'info-bsd' => '-i wlan IP', 'apt' => 'dnsutils', 'pacman' => 'dnsutils', 'rpm' => 'bind-utils', - }), - 'dmidecode' => ({ + }, + 'dmidecode' => { 'info' => '-M if no sys machine data; -m', 'info-bsd' => '-M if null sysctl; -m; -B if null sysctl', 'apt' => 'dmidecode', 'pacman' => 'dmidecode', 'rpm' => 'dmidecode', - }), - 'fdisk' => ({ + }, + 'fdisk' => { 'info' => '-D partition scheme (fallback)', 'info-bsd' => '-D partition scheme', 'apt' => 'fdisk', 'pacman' => 'util-linux', 'rpm' => 'util-linux', - }), - 'fetch' => ({ + }, + 'fetch' => { 'info' => '', 'info-bsd' => '-i (if no dig); -w,-W; -U', 'apt' => '', 'pacman' => '', 'rpm' => '', - }), - 'file' => ({ + }, + 'file' => { 'info' => '-o unmounted file system (if no lsblk)', 'info-bsd' => '-o unmounted file system', 'apt' => 'file', 'pacman' => 'file', 'rpm' => 'file', - }), - 'ftp' => ({ + }, + 'ftp' => { 'info' => '', 'info-bsd' => '-i (if no dig); -w,-W; -U', 'apt' => '', 'pacman' => '', 'rpm' => '', - }), - 'glabel' => ({ + }, + 'glabel' => { 'info' => '', 'info-bsd' => '-R; -D; -P. Get actual gptid /dev path', 'apt' => '', 'pacman' => '', 'rpm' => '', - }), - 'gpart' => ({ + }, + 'gpart' => { 'info' => '', 'info-bsd' => '-p,-P file system, size', 'apt' => '', 'pacman' => '', 'rpm' => '', - }), - 'hciconfig' => ({ + }, + 'hciconfig' => { 'info' => 'Experimental', 'info-bsd' => '', 'apt' => 'bluez', 'pacman' => 'bluez-utils', 'rpm' => 'bluez-utils', - }), - 'hddtemp' => ({ + }, + 'hddtemp' => { 'info' => '-Dx show hdd temp, if no /sys drive temp', 'info-bsd' => '-Dx show hdd temp', 'apt' => 'hddtemp', 'pacman' => 'hddtemp', 'rpm' => 'hddtemp', - }), - 'ifconfig' => ({ + }, + 'ifconfig' => { 'info' => '-i ip LAN (deprecated)', 'info-bsd' => '-i ip LAN', 'apt' => 'net-tools', 'pacman' => 'net-tools', 'rpm' => 'net-tools', - }), - 'ip' => ({ + }, + 'ip' => { 'info' => '-i ip LAN', 'info-bsd' => '', 'apt' => 'iproute', 'pacman' => 'iproute2', 'rpm' => 'iproute', - }), - 'ipmi-sensors' => ({ + }, + 'ipmi-sensors' => { 'info' => '-s IPMI sensors (servers)', 'info-bsd' => '', 'apt' => 'freeipmi-tools', 'pacman' => 'freeipmi', 'rpm' => 'freeipmi', - }), - 'ipmitool' => ({ + }, + 'ipmitool' => { 'info' => '-s IPMI sensors (servers)', 'info-bsd' => '-s IPMI sensors (servers)', 'apt' => 'ipmitool', 'pacman' => 'ipmitool', 'rpm' => 'ipmitool', - }), - 'lsblk' => ({ + }, + 'lsblk' => { 'info' => '-L LUKS/bcache; -o unmounted file system (best option)', 'info-bsd' => '-o unmounted file system', 'apt' => 'util-linux', 'pacman' => 'util-linux', 'rpm' => 'util-linux-ng', - }), - 'lvs' => ({ + }, + 'lvs' => { 'info' => '-L LVM data', 'info-bsd' => '', 'apt' => 'lvm2', 'pacman' => 'lvm2', 'rpm' => 'lvm2', - }), - 'lsusb' => ({ + }, + 'lsusb' => { 'info' => '-A usb audio; -J (optional); -N usb networking', 'info-bsd' => '-A; -J; -N. Alternate to usbdevs', 'apt' => 'usbutils', 'pacman' => 'usbutils', 'rpm' => 'usbutils', - }), - 'mdadm' => ({ + }, + 'mdadm' => { 'info' => '-Ra advanced mdraid data', 'info-bsd' => '', 'apt' => 'mdadm', 'pacman' => 'mdadm', 'rpm' => 'mdadm', - }), - 'modinfo' => ({ + }, + 'modinfo' => { 'info' => 'Ax; -Nx module version', 'info-bsd' => '', 'apt' => 'module-init-tools', 'pacman' => 'module-init-tools', 'rpm' => 'module-init-tools', - }), - 'runlevel' => ({ + }, + 'runlevel' => { 'info' => '-I fallback to Perl', 'info-bsd' => '', 'apt' => 'systemd or sysvinit', 'pacman' => 'systemd', 'rpm' => 'systemd or sysvinit', - }), - 'sensors' => ({ + }, + 'sensors' => { 'info' => '-s sensors output', 'info-bsd' => '', 'apt' => 'lm-sensors', 'pacman' => 'lm-sensors', 'rpm' => 'lm-sensors', - }), - 'smartctl' => ({ + }, + 'smartctl' => { 'info' => '-Da advanced data', 'info-bsd' => '-Da advanced data', 'apt' => 'smartmontools', 'pacman' => 'smartmontools', 'rpm' => 'smartmontools', - }), - 'strings' => ({ + }, + 'strings' => { 'info' => '-I sysvinit version', 'info-bsd' => '', 'apt' => 'binutils', 'pacman' => '?', 'rpm' => '?', - }), - 'sysctl' => ({ + }, + 'sysctl' => { 'info' => '', 'info-bsd' => '-C; -I; -m; -tm', 'apt' => '?', 'pacman' => '?', 'rpm' => '?', - }), - 'sudo' => ({ + }, + 'sudo' => { 'info' => '-Dx hddtemp-user; -o file-user', 'info-bsd' => '-Dx hddtemp-user; -o file-user', 'apt' => 'sudo', 'pacman' => 'sudo', 'rpm' => 'sudo', - }), - 'tree' => ({ + }, + 'tree' => { 'info' => '--debugger 20,21 /sys tree', 'info-bsd' => '--debugger 20,21 /sys tree', 'apt' => 'tree', 'pacman' => 'tree', 'rpm' => 'tree', - }), - 'upower' => ({ + }, + 'upower' => { 'info' => '-sx attached device battery info', 'info-bsd' => '-sx attached device battery info', 'apt' => 'upower', 'pacman' => 'upower', 'rpm' => 'upower', - }), - 'uptime' => ({ + }, + 'uptime' => { 'info' => '-I uptime', 'info-bsd' => '-I uptime', 'apt' => 'procps', 'pacman' => 'procps', 'rpm' => 'procps', - }), - 'usbdevs' => ({ + }, + 'usbdevs' => { 'info' => '', 'info-bsd' => '-A; -J; -N;', 'apt' => 'usbutils', 'pacman' => 'usbutils', 'rpm' => 'usbutils', - }), - 'wget' => ({ + }, + 'wget' => { 'info' => '-i (if no dig); -w,-W; -U', 'info-bsd' => '-i (if no dig); -w,-W; -U', 'apt' => 'wget', 'pacman' => 'wget', 'rpm' => 'wget', - }), + }, # Display Tools - 'glxinfo' => ({ + 'glxinfo' => { 'info' => '-G glx info', 'info-bsd' => '-G glx info', 'apt' => 'mesa-utils', 'pacman' => 'mesa-demos', 'rpm' => 'glx-utils (openSUSE 12.3 and later Mesa-demo-x)', - }), - 'wmctrl' => ({ + }, + 'wmctrl' => { 'info' => '-S active window manager (fallback)', 'info-bsd' => '-S active window managerr (fallback)', 'apt' => 'wmctrl', 'pacman' => 'wmctrl', 'rpm' => 'wmctrl', - }), - 'xdpyinfo' => ({ + }, + 'xdpyinfo' => { 'info' => '-G multi screen resolution', 'info-bsd' => '-G multi screen resolution', 'apt' => 'X11-utils', 'pacman' => 'xorg-xdpyinfo', 'rpm' => 'xorg-x11-utils', - }), - 'xprop' => ({ + }, + 'xprop' => { 'info' => '-S desktop data', 'info-bsd' => '-S desktop data', 'apt' => 'X11-utils', 'pacman' => 'xorg-xprop', 'rpm' => 'x11-utils', - }), - 'xrandr' => ({ + }, + 'xrandr' => { 'info' => '-G single screen resolution', 'info-bsd' => '-G single screen resolution', 'apt' => 'x11-xserver-utils', 'pacman' => 'xrandr', 'rpm' => 'x11-server-utils', - }), + }, # Perl Modules - 'Cpanel::JSON::XS' => ({ + 'Cpanel::JSON::XS' => { 'info' => '--output json - required for export.', 'info-bsd' => '--output json - required for export.', 'apt' => 'libcpanel-json-xs-perl', 'pacman' => 'perl-cpanel-json-xs', 'rpm' => 'perl-Cpanel-JSON-XS', - }), - 'File::Copy' => ({ + }, + 'File::Copy' => { 'info' => '--debug 20-22 - required to run debugger.', 'info-bsd' => '--debug 20-22 - required to run debugger.', 'apt' => 'Core Modules', 'pacman' => 'Core Modules', 'rpm' => 'perl-File-Copy', - }), - 'File::Find' => ({ + }, + 'File::Find' => { 'info' => '--debug 20-22 - required to run debugger.', 'info-bsd' => '--debug 20-22 - required to run debugger.', 'apt' => 'Core Modules', 'pacman' => 'Core Modules', 'rpm' => 'perl-File-Find', - }), - 'File::Spec::Functions' => ({ + }, + 'File::Spec::Functions' => { 'info' => '--debug 20-22 - required to run debugger.', 'info-bsd' => '--debug 20-22 - required to run debugger.', 'apt' => 'Core Modules', 'pacman' => 'Core Modules', 'rpm' => 'Core Modules', - }), - 'HTTP::Tiny' => ({ + }, + 'HTTP::Tiny' => { 'info' => '-U; -w,-W; -i (if dig not installed).', 'info-bsd' => '-U; -w,-W; -i (if dig not installed)', 'apt' => 'libhttp-tiny-perl', 'pacman' => 'Core Modules', 'rpm' => 'Perl-http-tiny', - }), - 'IO::Socket::SSL' => ({ + }, + 'IO::Socket::SSL' => { 'info' => '-U; -w,-W; -i (if dig not installed).', 'info-bsd' => '-U; -w,-W; -i (if dig not installed)', 'apt' => 'libio-socket-ssl-perl', 'pacman' => 'perl-io-socket-ssl', 'rpm' => 'perl-IO-Socket-SSL', - }), - 'JSON::XS' => ({ + }, + 'JSON::XS' => { 'info' => '--output json - required for export (legacy).', 'info-bsd' => '--output json - required for export (legacy).', 'apt' => 'libjson-xs-perl', 'pacman' => 'perl-json-xs', 'rpm' => 'perl-JSON-XS', - }), - 'Net::FTP' => ({ + }, + 'Net::FTP' => { 'info' => '--debug 21,22', 'info-bsd' => '--debug 21,22', 'apt' => 'Core Modules', 'pacman' => 'Core Modules', 'rpm' => 'Core Modules', - }), - 'Time::HiRes' => ({ + }, + 'Time::HiRes' => { 'info' => '-C cpu sleep (not required); --debug timers', 'info-bsd' => '-C cpu sleep (not required); --debug timers', 'apt' => 'Core Modules', 'pacman' => 'Core Modules', 'rpm' => 'perl-Time-HiRes', - }), - 'XML::Dumper' => ({ + }, + 'XML::Dumper' => { 'info' => '--output xml - Crude and raw.', 'info-bsd' => '--output xml - Crude and raw.', 'apt' => 'libxml-dumper-perl', 'pacman' => 'perl-xml-dumper', 'rpm' => 'perl-XML-Dumper', - }), + }, ## END PACKAGE MANAGER BLOCK ## ); - my %values = %{$data{$type}}; - return %values; + return %{$data{$type}}; } sub get_pm { my ($pm) = (''); @@ -3219,6 +3218,7 @@ sub make_line { } + #### ------------------------------------------------------------------- #### TOOLS #### -------------------------------------------------------------------