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

some bug fixes, a small glitch, added debuggers

Browse source
This commit is contained in:
inxi-svn 2014-08-14 04:08:54 +00:00
parent d2b254fac1
commit 5f09b1555c
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
inxi
View file

@ -4888,8 +4888,8 @@ get_dmidecode_data()
{ {
eval $LOGFS eval $LOGFS
local dmiData="" local dmiData="" b_debugger='false'
if [[ $B_DMIDECODE_SET != 'true' ]];then if [[ $B_DMIDECODE_SET != 'true' ]];then
dmidecodePath=$( type -p dmidecode 2>/dev/null ) dmidecodePath=$( type -p dmidecode 2>/dev/null )
if [[ -z $dmidecodePath ]];then if [[ -z $dmidecodePath ]];then
@ -4900,8 +4900,12 @@ get_dmidecode_data()
# used to separate results. Then we remove the doubled empty lines to keep it clean and # used to separate results. Then we remove the doubled empty lines to keep it clean and
# strip out all the stuff we don't want to see in the results. We want the error data in # strip out all the stuff we don't want to see in the results. We want the error data in
# stdout for error handling # stdout for error handling
# DMIDECODE_DATA="$( echo "$dmiData" | gawk -F ':' ' if [[ $b_debugger == 'true' ]];then
DMIDECODE_DATA="$( $dmidecodePath 2>&1 | gawk -F ':' ' dmiData="$( cat ~/bin/scripts/inxi/data/dmidecode/dmidecode-memory-variants-1.txt )"
else
dmiData="$( $dmidecodePath 2>&1 )"
fi
DMIDECODE_DATA="$( echo "$dmiData" | gawk -F ':' '
BEGIN { BEGIN {
IGNORECASE=1 IGNORECASE=1
cutExtraTab="false" cutExtraTab="false"
@ -8369,9 +8373,12 @@ get_ram_data()
if ( a_memory[j,3] == 0 ) { if ( a_memory[j,3] == 0 ) {
a_memory[j,3] = "" a_memory[j,3] = ""
} }
# print "mms:" aMaxModuleSize[m] ":dms:" aDerivedModuleSize[m] else {
a_memory[j,3]=int(a_memory[j,3]) # some weird cases believe they are strings!
}
#print "mms:" aMaxModuleSize[m] ":dms:" aDerivedModuleSize[m] ":mc:" a_memory[j,3]
if (aMaxModuleSize[m] != 0 && aDerivedModuleSize[m] != 0 && aDerivedModuleSize[m] > aMaxModuleSize[m]){ if (aMaxModuleSize[m] != 0 && aDerivedModuleSize[m] != 0 && aDerivedModuleSize[m] > aMaxModuleSize[m]){
aMaxModuleSize[m]=aDerivedModuleSize[m] aMaxModuleSize[m]=int(aDerivedModuleSize[m])
estModuleSize=" (est.)" estModuleSize=" (est.)"
} }
if (aMaxModuleSize[m] == 0 ){ if (aMaxModuleSize[m] == 0 ){
@ -8384,13 +8391,13 @@ get_ram_data()
estCap=" (est)" estCap=" (est)"
} }
} }
# print "mms:" aMaxModuleSize[m] ":dms:" aDerivedModuleSize[m] ":mc:" a_memory[j,3] #print "mms:" aMaxModuleSize[m] ":dms:" aDerivedModuleSize[m] ":mc:" a_memory[j,3]
# some cases of type 5 have too big module max size, just dump the data then # some cases of type 5 have too big module max size, just dump the data then
if ( aMaxModuleSize[m] != "" && a_memory[j,3] != "" && ( aMaxModuleSize[m] > a_memory[j,3] ) ){ if ( aMaxModuleSize[m] != "" && a_memory[j,3] != "" && ( aMaxModuleSize[m] > a_memory[j,3] ) ){
aMaxModuleSize[m] = "" aMaxModuleSize[m] = ""
# print "yes"
} }
if (a_memory[j,3] != "" ) { if (a_memory[j,3] != "" ) {
a_memory[j,3]=int(a_memory[j,3]) # some weird cases believe they are strings!
if ( a_memory[j,3] < 1024 ) { if ( a_memory[j,3] < 1024 ) {
a_memory[j,3] = a_memory[j,3] a_memory[j,3] = a_memory[j,3]
unit=" MB" unit=" MB"