fixed small issues, added SIO to mobo temp types, filtered out ps from -t c for slower systems

This commit is contained in:
inxi-svn 2010-02-18 06:34:23 +00:00
parent e6f728dbf9
commit 85f2543b31

4
inxi
View file

@ -3230,7 +3230,7 @@ get_ps_data()
IFS=$'\n' IFS=$'\n'
# note that inxi can use a lot of cpu, and can actually show up here as the script runs # note that inxi can use a lot of cpu, and can actually show up here as the script runs
A_PS_DATA=( $( ps aux --sort $sort_type | grep -Ev "($SCRIPT_NAME|%CPU)" | $head_tail -n $PS_COUNT | gawk ' A_PS_DATA=( $( ps aux --sort $sort_type | grep -Ev "($SCRIPT_NAME|%CPU|[[:space:]]ps[[:space:]])" | $head_tail -n $PS_COUNT | gawk '
BEGIN { BEGIN {
IGNORECASE=1 IGNORECASE=1
appName="" appName=""
@ -3491,7 +3491,7 @@ get_sensors_data()
# when constructing temp items for array. # when constructing temp items for array.
# note that because of charset issues, no tempUnit="°" tempWorkingUnit degree sign # note that because of charset issues, no tempUnit="°" tempWorkingUnit degree sign
# used, but it is required in testing regex to avoid error. # used, but it is required in testing regex to avoid error.
/^(M\/B|MB|SYS)(.*)\+([0-9]+)(.*)[ \t°](C|F)/ && $2 ~ /^[ \t]*\+([0-9]+)/ { /^(M\/B|MB|SIO|SYS)(.*)\+([0-9]+)(.*)[ \t°](C|F)/ && $2 ~ /^[ \t]*\+([0-9]+)/ {
moboTemp=gensub( /[ \t]+\+([0-9\.]*)(.*)/, "\\1", 1, $2 ) moboTemp=gensub( /[ \t]+\+([0-9\.]*)(.*)/, "\\1", 1, $2 )
tempWorkingUnit=gensub( /[ \t]+\+([0-9\.]+)[ \t°]+([CF])(.*)/, "\\2", 1, $2 ) tempWorkingUnit=gensub( /[ \t]+\+([0-9\.]+)[ \t°]+([CF])(.*)/, "\\2", 1, $2 )
if ( tempWorkingUnit ~ /^C|F$/ && tempUnit == "" ){ if ( tempWorkingUnit ~ /^C|F$/ && tempUnit == "" ){