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

New Feature, new version, new man page, new tarball. Laptop users should be happy,

Browse source 
-B option now shows, if available, battery data. Quite good data for systems
with /sys battery data, only rudimentary for systems using dmidecode (BSDs).
dmidecode has no current voltage/charge/current supported capacity.

Main row shows charge and condition. Condition shows you have much capacity the
battery currently has vs its design capacity. Charge shows the Wh/percent of
current capacity of battery (NOT the rated design capacity).

-x adds battery vendor/model info, and battery status (like, charging, discharging,
full).

-xx adds battery serial number and voltage information. Note that voltage information
is presented as Current Voltage / Designed minimum voltage.

-xxx adds battery chemistry (like Li-ion), cycles (note: there's a bug somewhere in
that makes the cycle count always be 0, I don't know if that's in the batteries,
the linux kernel, but it's not inxi, just FYI, the data is simply 0 always in all
my datasets so far.

For dmidecode output, the location of the batter is also shown in -xxx
This commit is contained in:
Harald Hope 2016-04-18 17:03:14 -07:00
parent dd67fd7cd1
commit 4f1a57d11b
3 changed files with 520 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

458
inxi
View file

@ -1,8 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### Version: 2.2.38 #### Version: 2.3.0
#### Date: 2016-03-31 #### Date: 2016-04-18
#### Patch Number: 00 #### Patch Number: 00
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
@ -254,6 +254,7 @@ ORIGINAL_IFS="$IFS"
## Initialize ## Initialize
A_ALSA_DATA='' A_ALSA_DATA=''
A_AUDIO_DATA='' A_AUDIO_DATA=''
A_BATTERY_DATA=''
A_CMDL='' A_CMDL=''
A_CPU_CORE_DATA='' A_CPU_CORE_DATA=''
A_CPU_DATA='' A_CPU_DATA=''
@ -334,6 +335,8 @@ B_SHOW_BASIC_RAID='false'
B_SHOW_BASIC_CPU='false' B_SHOW_BASIC_CPU='false'
B_SHOW_BASIC_DISK='false' B_SHOW_BASIC_DISK='false'
B_SHOW_BASIC_OPTICAL='false' B_SHOW_BASIC_OPTICAL='false'
B_SHOW_BATTERY='false'
B_SHOW_BATTERY_FORCED='false'
B_SHOW_CPU='false' B_SHOW_CPU='false'
B_SHOW_DISPLAY_DATA='false' B_SHOW_DISPLAY_DATA='false'
B_SHOW_DISK_TOTAL='false' B_SHOW_DISK_TOTAL='false'
@ -1816,6 +1819,17 @@ debug_data_collector()
else else
touch $debug_data_dir/strings-absent touch $debug_data_dir/strings-absent
fi fi
local id_dir='/sys/class/power_supply/'
local ids=$( ls $id_dir 2>/dev/null )
if [[ -n $ids ]];then
for batid in $ids
do
cat $id_dir$batid'/uevent' &> $debug_data_dir/sys-power-supply-$batid.txt
done
else
touch $debug_data_dir/sys-power-supply-none
fi
# leaving this commented out to remind that some systems do not # leaving this commented out to remind that some systems do not
# support strings --version, but will just simply hang at that command # support strings --version, but will just simply hang at that command
# which you can duplicate by simply typing: strings then hitting enter, you will get hang. # which you can duplicate by simply typing: strings then hitting enter, you will get hang.
@ -2535,7 +2549,7 @@ get_parameters()
# no need to run through these if there are no args # no need to run through these if there are no args
# reserved for future use: -g for extra Graphics; -m for extra Machine; -d for extra Disk # reserved for future use: -g for extra Graphics; -m for extra Machine; -d for extra Disk
elif [[ -n $1 ]];then elif [[ -n $1 ]];then
while getopts Abc:CdDfFGhHiIlmMnNopPrRsSt:uUv:V${weather_flag}xy:zZ%@:!: opt while getopts AbBc:CdDfFGhHiIlmMnNopPrRsSt:uUv:V${weather_flag}xy:zZ%@:!: opt
do do
case $opt in case $opt in
A) B_SHOW_AUDIO='true' A) B_SHOW_AUDIO='true'
@ -2548,9 +2562,14 @@ get_parameters()
B_SHOW_GRAPHICS='true' B_SHOW_GRAPHICS='true'
B_SHOW_INFO='true' B_SHOW_INFO='true'
B_SHOW_MACHINE='true' B_SHOW_MACHINE='true'
B_SHOW_BATTERY='true'
B_SHOW_NETWORK='true' B_SHOW_NETWORK='true'
B_SHOW_SYSTEM='true' B_SHOW_SYSTEM='true'
;; ;;
B) B_SHOW_BATTERY_FORCED='true'
B_SHOW_BATTERY='true'
use_short='false'
;;
c) if [[ $OPTARG =~ ^[0-9][0-9]?$ ]];then c) if [[ $OPTARG =~ ^[0-9][0-9]?$ ]];then
case $OPTARG in case $OPTARG in
99) 99)
@ -2614,6 +2633,7 @@ get_parameters()
B_SHOW_GRAPHICS='true' B_SHOW_GRAPHICS='true'
B_SHOW_INFO='true' B_SHOW_INFO='true'
B_SHOW_MACHINE='true' B_SHOW_MACHINE='true'
B_SHOW_BATTERY='true'
B_SHOW_NETWORK='true' B_SHOW_NETWORK='true'
B_SHOW_PARTITIONS='true' B_SHOW_PARTITIONS='true'
B_SHOW_RAID='true' B_SHOW_RAID='true'
@ -2640,6 +2660,7 @@ get_parameters()
use_short='false' use_short='false'
;; ;;
M) B_SHOW_MACHINE='true' M) B_SHOW_MACHINE='true'
B_SHOW_BATTERY='true'
use_short='false' use_short='false'
;; ;;
n) B_SHOW_ADVANCED_NETWORK='true' n) B_SHOW_ADVANCED_NETWORK='true'
@ -2706,6 +2727,7 @@ get_parameters()
if [[ $OPTARG -ge 2 ]];then if [[ $OPTARG -ge 2 ]];then
B_SHOW_BASIC_DISK='true' B_SHOW_BASIC_DISK='true'
B_SHOW_BASIC_RAID='true' B_SHOW_BASIC_RAID='true'
B_SHOW_BATTERY='true'
B_SHOW_MACHINE='true' B_SHOW_MACHINE='true'
B_SHOW_NETWORK='true' B_SHOW_NETWORK='true'
fi fi
@ -2950,11 +2972,12 @@ show_options()
# print_screen_output " " # print_screen_output " "
print_lines_basic "0" "" "$SCRIPT_NAME supports the following options. You can combine them, or list them one by one. Examples: $SCRIPT_NAME^-v4^-c6 OR $SCRIPT_NAME^-bDc^6. If you start $SCRIPT_NAME with no arguments, it will show the short form." print_lines_basic "0" "" "$SCRIPT_NAME supports the following options. You can combine them, or list them one by one. Examples: $SCRIPT_NAME^-v4^-c6 OR $SCRIPT_NAME^-bDc^6. If you start $SCRIPT_NAME with no arguments, it will show the short form."
print_screen_output " " print_screen_output " "
print_lines_basic "0" "" "The following options if used without -F, -b, or -v will show just option line(s): A, C, D, G, I, M, N, P, R, S, f, i, m, n, o, p, l, u, r, s, t - you can use these alone or together to show just the line(s) you want to see. If you use them with -v^[level], -b or -F, it will show the full output for that line along with the output for the chosen verbosity level." print_lines_basic "0" "" "The following options if used without -F, -b, or -v will show just option line(s): A, B, C, D, G, I, M, N, P, R, S, f, i, m, n, o, p, l, u, r, s, t - you can use these alone or together to show just the line(s) you want to see. If you use them with -v^[level], -b or -F, it will show the full output for that line along with the output for the chosen verbosity level."
print_screen_output "- - - - - - - - - - - - - - - - - - - - - - - - - - - - -" print_screen_output "- - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
print_screen_output "Output Control Options:" print_screen_output "Output Control Options:"
print_lines_basic "1" "-A" "Audio/sound card information." print_lines_basic "1" "-A" "Audio/sound card information."
print_lines_basic "1" "-b" "Basic output, short form. Like $SCRIPT_NAME^-v^2, only minus hard disk names ." print_lines_basic "1" "-b" "Basic output, short form. Like $SCRIPT_NAME^-v^2, only minus hard disk names ."
print_lines_basic "1" "-B" "Battery info, shows charge, condition, plus extra information (if battery present)."
print_lines_basic "1" "-c" "Color schemes. Scheme number is required. Color selectors run a color selector option prior to $SCRIPT_NAME starting which lets you set the config file value for the selection." print_lines_basic "1" "-c" "Color schemes. Scheme number is required. Color selectors run a color selector option prior to $SCRIPT_NAME starting which lets you set the config file value for the selection."
print_lines_basic "1" "" "Supported color schemes: 0-$color_scheme_count Example:^$SCRIPT_NAME^-c^11" print_lines_basic "1" "" "Supported color schemes: 0-$color_scheme_count Example:^$SCRIPT_NAME^-c^11"
print_lines_basic "1" "" "Color selectors for each type display (NOTE: irc and global only show safe color set):" print_lines_basic "1" "" "Color selectors for each type display (NOTE: irc and global only show safe color set):"
@ -2994,8 +3017,8 @@ show_options()
print_lines_basic "1" "" "Supported levels: 0-$VERBOSITY_LEVELS Example: $SCRIPT_NAME^-v^4" print_lines_basic "1" "" "Supported levels: 0-$VERBOSITY_LEVELS Example: $SCRIPT_NAME^-v^4"
print_lines_basic "2" "0" "Short output, same as: $SCRIPT_NAME" print_lines_basic "2" "0" "Short output, same as: $SCRIPT_NAME"
print_lines_basic "2" "1" "Basic verbose, -S + basic CPU + -G + basic Disk + -I." print_lines_basic "2" "1" "Basic verbose, -S + basic CPU + -G + basic Disk + -I."
print_lines_basic "2" "2" "Networking card (-N), Machine (-M) data, shows basic hard disk data (names only), and, if present, basic raid (devices only, and if inactive, notes that). similar to: $SCRIPT_NAME^-b" print_lines_basic "2" "2" "Networking card (-N), Machine (-M) data, if present, Battery (-B), basic hard disk data (names only), and, if present, basic raid (devices only, and if inactive, notes that). similar to: $SCRIPT_NAME^-b"
print_lines_basic "2" "3" "Advanced CPU (-C), network (-n) data, and switches on -x advanced data option." print_lines_basic "2" "3" "Advanced CPU (-C), battery, network (-n) data, and switches on -x advanced data option."
print_lines_basic "2" "4" "$partition_string_u size/filled data (-P) for (if present): /, /home, /var/, /boot. Shows full disk data (-D)." print_lines_basic "2" "4" "$partition_string_u size/filled data (-P) for (if present): /, /home, /var/, /boot. Shows full disk data (-D)."
print_lines_basic "2" "5" "Audio card (-A); sensors^(-s), memory/ram^(-m), $partition_string label^(-l) and UUID^(-u), short form of optical drives, standard raid data (-R)." print_lines_basic "2" "5" "Audio card (-A); sensors^(-s), memory/ram^(-m), $partition_string label^(-l) and UUID^(-u), short form of optical drives, standard raid data (-R)."
print_lines_basic "2" "6" "Full $partition_string (-p), unmounted $partition_string (-o), optical drive (-d), full raid; triggers -xx." print_lines_basic "2" "6" "Full $partition_string (-p), unmounted $partition_string (-o), optical drive (-d), full raid; triggers -xx."
@ -3007,6 +3030,7 @@ show_options()
print_lines_basic "1" "-W" "<location> Supported options for <location>: postal code; city, state/country; latitude, longitude. Only use if you want the weather somewhere other than the machine running $SCRIPT_NAME. Use only ascii characters, replace spaces in city/state/country names with '+'. Example:^$SCRIPT_NAME^-W^new+york,ny" print_lines_basic "1" "-W" "<location> Supported options for <location>: postal code; city, state/country; latitude, longitude. Only use if you want the weather somewhere other than the machine running $SCRIPT_NAME. Use only ascii characters, replace spaces in city/state/country names with '+'. Example:^$SCRIPT_NAME^-W^new+york,ny"
fi fi
print_lines_basic "1" "-x" "Adds the following extra data (only works with verbose or line output, not short form):" print_lines_basic "1" "-x" "Adds the following extra data (only works with verbose or line output, not short form):"
print_lines_basic "2" "-B" "Vendor/model, status (if available)"
print_lines_basic "2" "-C" "CPU Flags, Bogomips on Cpu;" print_lines_basic "2" "-C" "CPU Flags, Bogomips on Cpu;"
print_lines_basic "2" "-d" "Extra optical drive data; adds rev version to optical drive." print_lines_basic "2" "-d" "Extra optical drive data; adds rev version to optical drive."
print_lines_basic "2" "-D" "Hdd temp with disk data if you have hddtemp installed, if you are root OR if you have added to /etc/sudoers (sudo v. 1.7 or newer) Example:^<username>^ALL^=^NOPASSWD:^/usr/sbin/hddtemp" print_lines_basic "2" "-D" "Hdd temp with disk data if you have hddtemp installed, if you are root OR if you have added to /etc/sudoers (sudo v. 1.7 or newer) Example:^<username>^ALL^=^NOPASSWD:^/usr/sbin/hddtemp"
@ -3025,6 +3049,7 @@ show_options()
fi fi
print_lines_basic "1" "-xx" "Show extra, extra data (only works with verbose or line output, not short form):" print_lines_basic "1" "-xx" "Show extra, extra data (only works with verbose or line output, not short form):"
print_lines_basic "2" "-A" "Chip vendor:product ID for each audio device." print_lines_basic "2" "-A" "Chip vendor:product ID for each audio device."
print_lines_basic "2" "-B" "serial number, voltage (if available)."
print_lines_basic "2" "-C" "Minimum CPU speed, if available." print_lines_basic "2" "-C" "Minimum CPU speed, if available."
print_lines_basic "2" "-D" "Disk serial number." print_lines_basic "2" "-D" "Disk serial number."
print_lines_basic "2" "-G" "Chip vendor:product ID for each video card." print_lines_basic "2" "-G" "Chip vendor:product ID for each video card."
@ -3039,6 +3064,7 @@ show_options()
fi fi
print_lines_basic "2" "-@ 11-14" "Automatically uploads debugger data tar.gz file to ftp.techpatterns.com. EG: $SCRIPT_NAME^-xx@14" print_lines_basic "2" "-@ 11-14" "Automatically uploads debugger data tar.gz file to ftp.techpatterns.com. EG: $SCRIPT_NAME^-xx@14"
print_lines_basic "1" "-xxx" "Show extra, extra, extra data (only works with verbose or line output, not short form):" print_lines_basic "1" "-xxx" "Show extra, extra, extra data (only works with verbose or line output, not short form):"
print_lines_basic "2" "-B" "chemistry, cycles, location (if available)."
print_lines_basic "2" "-m" "Width of memory bus, data and total (if present and greater than data); Detail, if present, for Type; module voltage, if available." print_lines_basic "2" "-m" "Width of memory bus, data and total (if present and greater than data); Detail, if present, for Type; module voltage, if available."
print_lines_basic "2" "-S" "Panel/shell information in desktop output, if in X (like gnome-shell, cinnamon, mate-panel)." print_lines_basic "2" "-S" "Panel/shell information in desktop output, if in X (like gnome-shell, cinnamon, mate-panel)."
if [[ $B_ALLOW_WEATHER == 'true' ]];then if [[ $B_ALLOW_WEATHER == 'true' ]];then
@ -3974,6 +4000,229 @@ get_audio_alsa_data()
eval $LOGFE eval $LOGFE
} }
get_battery_data()
{
eval $LOGFS
local a_temp='' id_file='' count=0
local id_dir='/sys/class/power_supply/'
local ids=$( ls $id_dir 2>/dev/null ) battery_file=''
# ids='BAT0 BAT1 BAT2'
if [[ -n $ids && $B_FORCE_DMIDECODE == 'false' ]];then
for idx in $ids
do
battery_file=$id_dir$idx'/uevent'
if [[ -r $battery_file ]];then
# echo $battery_file
count=$(( $count + 1 ))
IFS=$'\n'
battery_data=$(
gawk -F '=' '
BEGIN {
IGNORECASE=1
name=""
status=""
present=""
chemistry=""
cycles=""
voltage_min_design=""
voltage_now=""
power_now=""
charge_full_design=""
charge_full=""
charge_now=""
capacity=""
capacity_level=""
model=""
company=""
serial=""
of_orig=""
location=""
}
{
gsub(/'"$BAN_LIST_NORMAL"'|,|battery|unknown/, "", $2)
gsub(/^ +| +$/, "", $2)
}
$1 ~ /^POWER_SUPPLY_NAME$/ {
name=$NF
}
$1 ~ /^POWER_SUPPLY_STATUS$/ {
status=$NF
}
$1 ~ /^POWER_SUPPLY$/ {
present=$NF
}
$1 ~ /^POWER_SUPPLY_TECHNOLOGY$/ {
chemistry=$NF
}
$1 ~ /^POWER_SUPPLY_CYCLE_COUNT$/ {
cycles=$NF
}
$1 ~ /^POWER_SUPPLY_VOLTAGE_MIN_DESIGN$/ {
voltage_min_design = $NF / 1000000
voltage_min_design = sprintf( "%.1f", voltage_min_design )
}
$1 ~ /^POWER_SUPPLY_VOLTAGE_NOW$/ {
voltage_now = $NF / 1000000
voltage_now = sprintf( "%.1f", voltage_now )
}
$1 ~ /^POWER_SUPPLY_POWER_NOW$/ {
power_now=$NF
}
$1 ~ /^POWER_SUPPLY_ENERGY_FULL_DESIGN$/ {
charge_full_design = $NF / 1000000
charge_full_design = sprintf( "%.1f", charge_full_design )
}
$1 ~ /^POWER_SUPPLY_ENERGY_FULL$/ {
charge_full = $NF / 1000000
charge_full = sprintf( "%.1f", charge_full )
}
$1 ~ /^POWER_SUPPLY_ENERGY_NOW$/ {
charge_now = $NF / 1000000
charge_now = sprintf( "%.1f", charge_now )
}
$1 ~ /^POWER_SUPPLY_CHARGE_FULL_DESIGN$/ {
charge_full_design = $NF / 100000
charge_full_design = sprintf( "%.1f", charge_full_design )
}
$1 ~ /^POWER_SUPPLY_CHARGE_FULL$/ {
charge_full = $NF / 100000
charge_full = sprintf( "%.1f", charge_full )
}
$1 ~ /^POWER_SUPPLY_CHARGE_NOW$/ {
charge_now = $NF / 100000
charge_now = sprintf( "%.1f", charge_now )
}
$1 ~ /^POWER_SUPPLY_CAPACITY$/ {
if ( $NF != "" ){
capacity=$NF "%"
}
}
$1 ~ /^POWER_SUPPLY_CAPACITY_LEVEL$/ {
capacity_level=$NF
}
$1 ~ /^POWER_SUPPLY_MODEL_NAME$/ {
model=$NF
}
$1 ~ /^POWER_SUPPLY_MANUFACTURER$/ {
company=$NF
}
$1 ~ /^POWER_SUPPLY_SERIAL_NUMBER$/ {
serial=$NF
}
END {
if (charge_now != "" && charge_full != "" ){
capacity = 100*charge_now/charge_full
capacity = sprintf( "%.1f%", capacity )
}
if (charge_full_design != "" && charge_full != "" ){
of_orig=100*charge_full/charge_full_design
of_orig = sprintf( "%.0f%", of_orig )
}
entry = name "," status "," present "," chemistry "," cycles "," voltage_min_design "," voltage_now ","
entry = entry power_now "," charge_full_design "," charge_full "," charge_now "," capacity ","
entry = entry capacity_level "," of_orig "," model "," company "," serial "," location
print entry
}' < $battery_file )
# <<< "$data" )
# < $battery_file )
A_BATTERY_DATA[$count]=$battery_data
IFS="$ORIGINAL_IFS"
fi
done
elif [[ $B_FORCE_DMIDECODE == 'true' ]] || [[ ! -d $id_dir && -z $ids ]];then
get_dmidecode_data
if [[ -n $DMIDECODE_DATA ]];then
if [[ $DMIDECODE_DATA == 'dmidecode-error-'* ]];then
A_BATTERY_DATA[0]=$DMIDECODE_DATA
# please note: only dmidecode version 2.11 or newer supports consistently the -s flag
else
IFS=$'\n'
# NOTE: this logic has a flaw, which is multiple batteries, which won't work without
# gawk arrays, but sorry, too much of a pain given how little useful data from dmidecode
A_BATTERY_DATA=( $( gawk -F ':' '
BEGIN {
IGNORECASE=1
name=""
status=""
present=""
chemistry=""
cycles=""
voltage_min_design=""
voltage_now=""
power_now=""
charge_full_design=""
charge_full=""
charge_now=""
capacity=""
capacity_level=""
model=""
company=""
serial=""
of_orig=""
location=""
bItemFound="false"
}
{
gsub(/'"$BAN_LIST_NORMAL"'|,|battery|unknown/, "", $2)
gsub(/^ +| +$/, "", $1)
gsub(/^ +| +$/, "", $2)
}
/^Portable Battery/ {
while ( getline && !/^$/ ) {
if ( $1 ~ /^Location/ ) { location=$2 }
if ( $1 ~ /^Manufacturer/ ) { company=$2 }
if ( $1 ~ /^Serial/ ) { serial=$2 }
if ( $1 ~ /^Name/ ) { model=$2 }
if ( $1 ~ /^Design Capacity/ ) {
sub(/^[[:space:]]*mwh/, "", $2)
charge_full_design = $NF / 1000
charge_full_design = sprintf( "%.1f", charge_full_design )
}
if ( $1 ~ /^Design Voltage/ ) {
sub(/^[[:space:]]*mv/, "", $2)
voltage_min_design = $NF / 1000
voltage_min_design = sprintf( "%.1f", voltage_min_design )
}
if ( $1 ~ /^SBDS Chemistry/ ) { chemistry=$2 }
}
testString=company serial model charge_full_design voltage_min_design
if ( testString != "" ) {
bItemFound="true"
exit # exit loop, we are not handling > 1 batteries
}
}
END {
if ( bItemFound == "true" ) {
name="BAT-1"
if (charge_now != "" && charge_full != "" ){
capacity = 100*charge_now/charge_full
capacity = sprintf( "%.1f%", capacity )
}
if (charge_full_design != "" && charge_full != "" ){
of_orig=100*charge_full/charge_full_design
of_orig = sprintf( "%.0f%", of_orig )
}
entry = name "," status "," present "," chemistry "," cycles "," voltage_min_design "," voltage_now ","
entry = entry power_now "," charge_full_design "," charge_full "," charge_now "," capacity ","
entry = entry capacity_level "," of_orig "," model "," company "," serial "," location
print entry
}
}' <<< "$DMIDECODE_DATA" ) )
IFS="$ORIGINAL_IFS"
fi
fi
fi
# echo $array_string
#echo ${#A_BATTERY_DATA[@]}
a_temp=${A_BATTERY_DATA[@]}
# echo $a_temp
log_function_data "A_BATTERY_DATA: $a_temp"
eval $LOGFE
}
## create A_CPU_CORE_DATA, currently with two values: integer core count; core string text ## create A_CPU_CORE_DATA, currently with two values: integer core count; core string text
## return value cpu core count string, this helps resolve the multi redundant lines of old style output ## return value cpu core count string, this helps resolve the multi redundant lines of old style output
get_cpu_core_count() get_cpu_core_count()
@ -5440,7 +5689,7 @@ get_dmidecode_data()
fi fi
# these tests first, because bsd error messages like this (note how many : are in the string) # these tests first, because bsd error messages like this (note how many : are in the string)
# inxi: line 4928: /usr/local/sbin/dmidecode: Permission denied # inxi: line 4928: /usr/local/sbin/dmidecode: Permission denied
if [[ ${#dmiData} -lt 100 ]];then if [[ ${#dmiData} -lt 200 ]];then
if [[ -z ${dmiData/*Permission denied*/} ]];then if [[ -z ${dmiData/*Permission denied*/} ]];then
# if [[ -n $( grep -i 'Permission denied' <<< "$dmiData" ) ]];then # if [[ -n $( grep -i 'Permission denied' <<< "$dmiData" ) ]];then
DMIDECODE_DATA='dmidecode-error-requires-root' DMIDECODE_DATA='dmidecode-error-requires-root'
@ -11170,6 +11419,9 @@ print_it_out()
if [[ $B_SHOW_MACHINE == 'true' ]];then if [[ $B_SHOW_MACHINE == 'true' ]];then
print_machine_data print_machine_data
fi fi
if [[ $B_SHOW_BATTERY == 'true' ]];then
print_battery_data
fi
if [[ $B_SHOW_BASIC_CPU == 'true' || $B_SHOW_CPU == 'true' ]];then if [[ $B_SHOW_BASIC_CPU == 'true' || $B_SHOW_CPU == 'true' ]];then
print_cpu_data print_cpu_data
fi fi
@ -11507,6 +11759,188 @@ print_audio_data()
eval $LOGFE eval $LOGFE
} }
print_battery_data()
{
eval $LOGFS
local line_starter='Battery' print_data=''
get_battery_data
if [[ -n ${A_BATTERY_DATA[@]} ]];then
local battery_data='' battery_string=''
local present='' chemistry='' cycles='' voltage_min_design='' voltage_now=''
local power_now='' charge_full_design='' charge_full='' charge_now='' capacity=''
local capacity_level='' model='' company='' serial='' of_orig='' model='' condition=''
local power=''
# echo ${A_BATTERY_DATA[@]}
for (( i=0; i< ${#A_BATTERY_DATA[@]}; i++ ))
do
battery_data=''
print_data=''
battery_string=''
charge=''
model=''
condition=''
voltage=''
name=''
status=''
present=''
chemistry=''
cycles=''
voltage_min_design=''
voltage_now=''
power_now=''
charge_full_design=''
charge_full=''
charge_now=''
capacity=''
capacity_level=''
of_orig=''
model=''
company=''
serial=''
location='' # dmidecode only
IFS=","
a_battery_working=( ${A_BATTERY_DATA[i]} )
IFS="$ORIGINAL_IFS"
bat_id="$(( $i + 1 ))"
if [[ -n ${a_battery_working[10]} ]];then
charge="${a_battery_working[10]} Wh "
fi
if [[ -n ${a_battery_working[11]} ]];then
charge="$charge${a_battery_working[11]} "
fi
if [[ $charge == '' ]];then
charge='N/A '
fi
charge="${C1}charge$SEP3${C2} $charge"
if [[ -n ${a_battery_working[9]} ]];then
condition="${a_battery_working[9]}"
else
condition='NA'
fi
if [[ -n ${a_battery_working[8]} ]];then
condition="$condition/${a_battery_working[8]} Wh "
else
condition="$condition/NA Wh "
fi
if [[ -n ${a_battery_working[13]} ]];then
condition="$condition(${a_battery_working[13]}) "
fi
if [[ $condition == '' ]];then
condition='N/A '
fi
condition="${C1}condition$SEP3${C2} $condition"
if [[ $B_EXTRA_DATA == 'true' ]];then
if [[ -n ${a_battery_working[15]} ]];then
model="${a_battery_working[15]} "
fi
if [[ -n ${a_battery_working[14]} ]];then
model="$model${a_battery_working[14]} "
fi
if [[ $model == '' ]];then
model='N/A '
fi
model="${C1}model$SEP3${C2} $model"
if [[ -n ${a_battery_working[1]} ]];then
status="${a_battery_working[1]} "
else
status="N/A "
fi
status="${C1}status$SEP3${C2} $status"
fi
if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
if [[ -n ${a_battery_working[16]} ]];then
serial="${a_battery_working[16]} "
else
serial='N/A '
fi
serial="${C1}serial$SEP3${C2} $serial"
if [[ -n ${a_battery_working[6]} ]];then
voltage="${a_battery_working[6]}"
fi
if [[ -n ${a_battery_working[5]} ]];then
if [[ $voltage == '' ]];then
voltage='NA'
fi
voltage="$voltage/${a_battery_working[5]} "
fi
if [[ $voltage == '' ]];then
voltage='NA '
fi
voltage="${C1}volts$SEP3${C2} $voltage"
fi
if [[ $B_EXTRA_EXTRA_EXTRA_DATA == 'true' ]];then
if [[ -n ${a_battery_working[3]} ]];then
chemistry="${a_battery_working[3]} "
fi
if [[ -n ${a_battery_working[4]} ]];then
cycles="${C1}cycles$SEP3${C2} ${a_battery_working[4]} "
fi
# location is dmidecode only
if [[ -n ${a_battery_working[17]} ]];then
location="${C1}loc$SEP3${C2} ${a_battery_working[17]} "
fi
fi
if [[ -n ${a_battery_working[15]} ]];then
battery_string="${C1}${a_battery_working[0]}$SEP3${C2} $charge$condition"
battery_data="$model$chemistry$serial$status$cycles$location"
fi
if [[ ${A_BATTERY_DATA[0]} == 'dmidecode-error-'* ]];then
error_string=$( print_dmidecode_error 'bat' "${A_BATTERY_DATA[0]}" )
battery_string=${C2}$error_string
battery_data=''
voltage=''
fi
if [[ -n $battery_string ]];then
if [[ $( calculate_line_length "$battery_string$voltage$battery_data" ) -lt $COLS_INNER ]];then
#echo one
print_data=$( create_print_line "$line_starter" "$battery_string$voltage$battery_data" )
print_screen_output "$print_data"
# print the line
else
# keep the driver on the same line no matter what, looks weird alone on its own line
if [[ $( calculate_line_length "$battery_string$voltage$battery_data" ) -gt $COLS_INNER ]];then
if [[ $( calculate_line_length "$battery_string$voltage" ) -gt $COLS_INNER ]];then
print_data=$( create_print_line "$line_starter" "$battery_string" )
print_screen_output "$print_data"
line_starter=' '
battery_string=''
print_data=$( create_print_line "$line_starter" "$voltage" )
print_screen_output "$print_data"
voltage=''
else
print_data=$( create_print_line "$line_starter" "$battery_string$voltage" )
print_screen_output "$print_data"
line_starter=' '
voltage=''
battery_string=''
fi
#echo two
if [[ $battery_data != '' ]];then
print_data=$( create_print_line "$line_starter" "$battery_data" )
print_screen_output "$print_data"
fi
else
#echo three
print_data=$( create_print_line "$line_starter" "$battery_string$voltage$battery_data" )
print_screen_output "$print_data"
fi
fi
line_starter=' '
fi
done
elif [[ $B_SHOW_BATTERY_FORCED == 'true' ]];then
print_data=$( create_print_line "$line_starter" "No battery data found in /sys or dmidecode. Is one present?" )
print_screen_output "$print_data"
fi
eval $LOGFE
}
print_cpu_data() print_cpu_data()
{ {
eval $LOGFS eval $LOGFS
@ -11781,19 +12215,21 @@ print_cpu_flags_full()
eval $LOGFE eval $LOGFE
} }
# args: $1 - type [sys/default]; $2 - get_dmidecode_data error return # args: $1 - type [sys/bat/default]; $2 - get_dmidecode_data error return
print_dmidecode_error() print_dmidecode_error()
{ {
eval $LOGFS eval $LOGFS
local error_message='Unknown dmidecode error.' local error_message='Unknown dmidecode error.'
local sysDmiError='Using ' local sysDmiError='Using '
if [[ $1 == 'sys' ]];then if [[ $1 == 'sys' || $1 == 'bat' ]];then
if [[ $B_FORCE_DMIDECODE == 'true' ]];then if [[ $B_FORCE_DMIDECODE == 'true' ]];then
sysDmiError='Forcing ' sysDmiError='Forcing '
# dragonfly has /sys, but it's empty # dragonfly has /sys, but it's empty
elif [[ $BSD_TYPE == '' || -d /sys/devices ]];then elif [[ $1 == 'sys' ]] && [[ $BSD_TYPE == '' || -d /sys/devices ]];then
sysDmiError='No /sys/class/dmi; using ' sysDmiError='No /sys/class/dmi; using '
#elif [[ $1 == 'bat' ]] && [[ $BSD_TYPE == '' || -d /sys/devices ]];then
# sysDmiError='No /sys/ battery; using '
else else
sysDmiError='Using ' sysDmiError='Using '
fi fi
@ -11804,6 +12240,8 @@ print_dmidecode_error()
error_message="${sysDmiError}dmidecode: dmidecode is not installed." error_message="${sysDmiError}dmidecode: dmidecode is not installed."
elif [[ $2 == 'dmidecode-error-no-smbios-dmi-data' ]];then elif [[ $2 == 'dmidecode-error-no-smbios-dmi-data' ]];then
error_message="${sysDmiError}dmidecode: no smbios data available. Old system?" error_message="${sysDmiError}dmidecode: no smbios data available. Old system?"
elif [[ $2 == 'dmidecode-error-no-battery-data' ]];then
error_message="${sysDmiError}dmidecode: no battery data available."
elif [[ $2 == 'dmidecode-error-unknown-error' ]];then elif [[ $2 == 'dmidecode-error-unknown-error' ]];then
error_message="${sysDmiError}dmidecode: unknown error occured" error_message="${sysDmiError}dmidecode: unknown error occured"
fi fi

46
inxi.1
View file

@ -1,10 +1,10 @@
.TH INXI 1 "2016\-03\-21" inxi "inxi manual" .TH INXI 1 "2016\-04\-18" inxi "inxi manual"
.SH NAME .SH NAME
inxi \- Command line system information script for console and IRC inxi \- Command line system information script for console and IRC
.SH SYNOPSIS .SH SYNOPSIS
.B inxi \fR \- Single line, short form. Very basic output. .B inxi \fR \- Single line, short form. Very basic output.
.B inxi \fR[\fB\-AbCdDfFGhHiIlmMnNopPrRsSuw\fR] \fR[\fB\-c NUMBER\fR] \fR[\fB\-v NUMBER\fR] .B inxi \fR[\fB\-AbBCdDfFGhHiIlmMnNopPrRsSuw\fR] \fR[\fB\-c NUMBER\fR] \fR[\fB\-v NUMBER\fR]
.B inxi \fR[\fB\-t \fR(\fBc\fR or\fB m\fR or\fB cm\fR or\fB mc NUMBER\fR)] \fR[\fB\-x \-OPTION\fR(\fBs\fR)] \fR[\fB\-xx \-OPTION\fR(\fBs\fR)] \fR[\fB\-xxx \-OPTION\fR(\fBs\fR)] .B inxi \fR[\fB\-t \fR(\fBc\fR or\fB m\fR or\fB cm\fR or\fB mc NUMBER\fR)] \fR[\fB\-x \-OPTION\fR(\fBs\fR)] \fR[\fB\-xx \-OPTION\fR(\fBs\fR)] \fR[\fB\-xxx \-OPTION\fR(\fBs\fR)]
@ -31,19 +31,38 @@ Letters with numbers can have no gap or a gap at your discretion unless using \f
For example: For example:
.B inxi \-AG\fR or \fBinxi \-A \-G\fR or \fBinxi \-c10 .B inxi \-AG\fR or \fBinxi \-A \-G\fR or \fBinxi \-c10\fR
.SH STANDARD OPTIONS .SH STANDARD OPTIONS
.TP .TP
.B \-A .B \-A
Show Audio/sound card information. Show Audio/sound card information.
.TP .TP
.B \-b .B \-b
Shows basic output, short form (previously \fB\-d\fR). Same as: \fBinxi \-v 2 Shows basic output, short form (previously \fB\-d\fR). Same as: \fBinxi \-v 2\fR
.TP
.B \-B
Shows Battery data, charge, condition, plus extra information (if battery present).
Uses \fB/sys\fR or for BSDs, dmidecode. dmidecode does not have very much information,
and none about current battery state/charge/voltage. Supports multiple batteries in
when using /sys data.
Note on the \fBcharge\fR item, the output shows the current charge, and the percent of
the available capacity, which can be less than the original design capacity. In the
following example, the actual current capacity of the battery is \fB22.2 Wh\fR,
so the charge shows what percent of the current capacity is charged.
For example: \fB20.1 Wh 95.4%\fR
The \fBcondition\fR item shows the current available capacity / original design capacity,
then the percentage of original capacity available in the battery. In the following
example, the battery capacity is only 61% of it's original amount.
For example: \fB22.2/36.4 Wh 61%\fR
.TP .TP
.B \-c \fR[\fB0\fR\-\fB32\fR] .B \-c \fR[\fB0\fR\-\fB32\fR]
Available color schemes. Scheme number is required. Available color schemes. Scheme number is required.
Supported color schemes: \fB0\-42 Supported color schemes: \fB0\-42\fR
.TP .TP
.B \-c \fR[\fB94\fR\-\fB99\fR] .B \-c \fR[\fB94\fR\-\fB99\fR]
Color selectors run a color selector option prior to inxi starting which lets Color selectors run a color selector option prior to inxi starting which lets
@ -248,8 +267,8 @@ Supported levels: \fB0\-7\fR Examples :\fB inxi \-v 4 \fR or \fB inxi \-v4\fR
+ \fB\-G\fR + basic Disk + \fB\-I\fR. + \fB\-G\fR + basic Disk + \fB\-I\fR.
.TP .TP
.B \-v 2 .B \-v 2
\- Adds networking card (\fB\-N\fR), Machine (\fB\-M\fR) data, and shows basic hard disk data \- Adds networking card (\fB\-N\fR), Machine (\fB\-M\fR) data, Battery (if available), and shows basic hard disk data
(names only). Same as: \fBinxi \-b (names only). Same as: \fBinxi \-b\fR
.TP .TP
.B \-v 3 .B \-v 3
\- Adds advanced CPU (\fB\-C\fR); network (\fB\-n\fR) data; triggers \fB\-x\fR advanced data option. \- Adds advanced CPU (\fB\-C\fR); network (\fB\-n\fR) data; triggers \fB\-x\fR advanced data option.
@ -308,6 +327,9 @@ The following shows which lines / items get extra information with each extra da
.B \-x \-A .B \-x \-A
\- Shows PCI Bus ID/Usb ID number of each Audio device. \- Shows PCI Bus ID/Usb ID number of each Audio device.
.TP .TP
.B \-x \-B
\- Shows Vendor/Model, battery status (if battery present).
.TP
.B \-x \-C .B \-x \-C
\- bogomips on CPU (if available); CPU Flags (short list). \- bogomips on CPU (if available); CPU Flags (short list).
.TP .TP
@ -375,6 +397,11 @@ system Used/Total ram data if \fB\-t m\fR (memory) is not used AND \fB\-I\fR is
.B \-xx \-A .B \-xx \-A
\- Adds vendor:product ID of each Audio device. \- Adds vendor:product ID of each Audio device.
.TP .TP
.B \-xx \-B
\- Adds serial number, voltage (if available).
Note that \fBvolts\fR shows the data (if available) as: Current Voltage Now / Minimum Design Voltage
.TP
.B \-xx \-C .B \-xx \-C
\- Shows Minimum CPU speed (if available). \- Shows Minimum CPU speed (if available).
.TP .TP
@ -425,6 +452,11 @@ Supports most known display managers, like xdm, gdm, kdm, slim, lightdm, or mdm.
.B \-xx \-@ <11\-14> .B \-xx \-@ <11\-14>
\- Automatically uploads debugger data tar.gz file to \fIftp.techpatterns.com\fR. \- Automatically uploads debugger data tar.gz file to \fIftp.techpatterns.com\fR.
.TP .TP
.B \-xxx \-B
\- Adds battery chemistry (like: \fBLi-ion\fR), cycles (NOTE: there appears to be a problem with the Linux kernel
obtaining the cycle count, so this almost always shows \fB0\fR. There's nothing that can be done about this glitch, the
data is simply not availabe as of 2016-04-18), location (only available from dmidecode derived output).
.TP
.B \-xxx \-m .B \-xxx \-m
\- Memory bus width: primary bus width, and if present, total width. eg: bus width: 64 bit (total: 72 bits). Note that total / data widths are mixed up sometimes in dmidecode output, so inxi will take the larger value as total if present. If no total width data is found, then inxi will not show that item. \- Memory bus width: primary bus width, and if present, total width. eg: bus width: 64 bit (total: 72 bits). Note that total / data widths are mixed up sometimes in dmidecode output, so inxi will take the larger value as total if present. If no total width data is found, then inxi will not show that item.
.TP .TP

32
inxi.changelog
View file

@ -1,3 +1,35 @@
=====================================================================================
Version: 2.3.0
Patch Version: 00
Script Date: 2016-04-18
-----------------------------------
Changes:
-----------------------------------
New Feature, new version, new man page, new tarball. Laptop users should be happy,
-B option now shows, if available, battery data. Quite good data for systems
with /sys battery data, only rudimentary for systems using dmidecode (BSDs).
dmidecode has no current voltage/charge/current supported capacity.
Main row shows charge and condition. Condition shows you have much capacity the
battery currently has vs its design capacity. Charge shows the Wh/percent of
current capacity of battery (NOT the rated design capacity).
-x adds battery vendor/model info, and battery status (like, charging, discharging,
full).
-xx adds battery serial number and voltage information. Note that voltage information
is presented as Current Voltage / Designed minimum voltage.
-xxx adds battery chemistry (like Li-ion), cycles (note: there's a bug somewhere in
that makes the cycle count always be 0, I don't know if that's in the batteries,
the linux kernel, but it's not inxi, just FYI, the data is simply 0 always in all
my datasets so far.
For dmidecode output, the location of the batter is also shown in -xxx
-----------------------------------
-- Harald Hope - Mon, 18 Apr 2016 16:55:12 -0700
===================================================================================== =====================================================================================
Version: 2.2.38 Version: 2.2.38
Patch Version: 00 Patch Version: 00