bug fix, update version number, removed extra {...} in if clause.

This doesn't fix the main xeon failure though
This commit is contained in:
inxi-svn 2009-01-25 02:22:16 +00:00
parent cf7508d125
commit 959caae1f7

12
inxi
View file

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### version: 0.9.5 #### version: 0.9.6
#### Date: 23 January 2009 #### Date: 24 January 2009
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
######################################################################## ########################################################################
@ -1468,7 +1468,7 @@ get_cpu_data()
else { else {
printf("%s %s\n", max, "Mhz") printf("%s %s\n", max, "Mhz")
} }
}' $DIR_CPUINFO)) }' $DIR_CPUINFO ))
fi fi
IFS="$ORIGINAL_IFS" IFS="$ORIGINAL_IFS"
@ -1484,8 +1484,7 @@ get_cpu_ht_multicore_smp_data()
# if = 1 processor then single core/processor Uni-Processor (UP) # if = 1 processor then single core/processor Uni-Processor (UP)
if [[ $B_CPUINFO == 'true' ]]; then if [[ $B_CPUINFO == 'true' ]]; then
{ A_CPU_TYPE_PCNT_CCNT=( $( gawk '
A_CPU_TYPE_PCNT_CCNT=( $(gawk '
BEGIN { FS=": "; i = 0 } {IGNORECASE = 1} BEGIN { FS=": "; i = 0 } {IGNORECASE = 1}
/^processor/ { num_of_processors = $NF + 1 } # counts logical processors, both HT and physical /^processor/ { num_of_processors = $NF + 1 } # counts logical processors, both HT and physical
/^cpu cores/ { num_of_cores = $NF } # counts physical cores /^cpu cores/ { num_of_cores = $NF } # counts physical cores
@ -1551,8 +1550,7 @@ get_cpu_ht_multicore_smp_data()
} }
} }
END { print type " " processors " " cores } END { print type " " processors " " cores }
' $DIR_CPUINFO )) ' $DIR_CPUINFO ) )
}
fi fi
} }