dmitriy.kazimirov/inxi
1
0
Fork 0
mirror of https://github.com/smxi/inxi.git synced 2025-01-19 08:57:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

New version, new tarball. This fixes an issue where sloppy regex was removing the BIOS

Browse source 
from BIOSTAR. Also fixed a few other sloppy gsub, and fixed a few gensub errors as well.

Since BIOSTAR is a fairly common mobo, I'm surprised I haven't gotten this bug report
before.

This closes issue #102.
This commit is contained in:
Harald Hope 2016-12-24 15:02:59 -08:00
parent 31e65c738c
commit d2986cbe8a
2 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
inxi
View file

@ -1,8 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### Version: 2.3.6 #### Version: 2.3.7
#### Date: 2016-12-19 #### Date: 2016-12-24
#### Patch Number: 00 #### Patch Number: 00
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
@ -6031,7 +6031,7 @@ get_dmidecode_data()
sub(/^[[:space:]]+/, "", twoData) sub(/^[[:space:]]+/, "", twoData)
sub(/^Base Board .*|^Chassis .*|empty|.*O\.E\.M\..*|.*OEM.*|^Not .*|^System .*|.*unknow.*|.*N\/A.*|none|^To be filled.*|^0x[0]+$|\[Empty\]|<Bad Index>|^\.\.$/, "", twoData) sub(/^Base Board .*|^Chassis .*|empty|.*O\.E\.M\..*|.*OEM.*|^Not .*|^System .*|.*unknow.*|.*N\/A.*|none|^To be filled.*|^0x[0]+$|\[Empty\]|<Bad Index>|^\.\.$/, "", twoData)
sub(/.*(AssetTagNum|Manufacturer| Or Motherboard|PartNum.*|SerNum).*/, "", twoData) sub(/.*(AssetTagNum|Manufacturer| Or Motherboard|PartNum.*|SerNum).*/, "", twoData)
gsub(/bios|acpi/, "", twoData) gsub(/\ybios\y|\yacpi\y/, "", twoData) # note: biostar
sub(/http:\/\/www.abit.com.tw\//, "Abit", twoData) sub(/http:\/\/www.abit.com.tw\//, "Abit", twoData)
# for double indented values replace with ~ so later can test for it, we are trusting that # for double indented values replace with ~ so later can test for it, we are trusting that
@ -6269,8 +6269,8 @@ get_graphics_card_data()
gsub(/'"$BAN_LIST_ARRAY"'/, " ", $NF) gsub(/'"$BAN_LIST_ARRAY"'/, " ", $NF)
gsub(/^ +| +$/, "", $NF) gsub(/^ +| +$/, "", $NF)
gsub(/ [ \t]+/, " ", $NF) gsub(/ [ \t]+/, " ", $NF)
busId=gensub(/^([0-9a-f:\.]+) (.+)$/,"\\1","",$1) busId=gensub(/^([0-9a-f:\.]+) (.+)$/,"\\1","g",$1)
trueCard=gensub(/(.*)\.([0-9]+)$/,"\\2","",busId) trueCard=gensub(/(.*)\.([0-9]+)$/,"\\2","g",busId)
if ( trueCard == 0 ) { if ( trueCard == 0 ) {
print $NF "," busId print $NF "," busId
} }
@ -6518,7 +6518,7 @@ get_graphics_display_server_data()
vendorRelease="" vendorRelease=""
} }
/vendor string/ { /vendor string/ {
gsub(/the|inc|foundation|project|corporation/, "", $2) gsub(/\ythe\y|\yinc\y|foundation|project|corporation/, "", $2)
gsub(/'"$BAN_LIST_ARRAY"'/, " ", $2) gsub(/'"$BAN_LIST_ARRAY"'/, " ", $2)
gsub(/^ +| +$/, "", $2) gsub(/^ +| +$/, "", $2)
gsub(/ [ \t]+/, " ", $2) gsub(/ [ \t]+/, " ", $2)
@ -6660,6 +6660,7 @@ get_hdd_data_basic()
fi fi
# echo ss: $swap_size # echo ss: $swap_size
hdd_data="$( eval $df_string )" hdd_data="$( eval $df_string )"
# eval $df_string | awk 'BEGIN{tot=0} !/total/ {tot+=$4} END{print tot}' # eval $df_string | awk 'BEGIN{tot=0} !/total/ {tot+=$4} END{print tot}'
log_function_data 'raw' "hdd_data:\n$hdd_data" log_function_data 'raw' "hdd_data:\n$hdd_data"
hdd_used=$( echo "$hdd_data" | gawk -v bsdType="$BSD_TYPE" -v swapSize="$swap_size" ' hdd_used=$( echo "$hdd_data" | gawk -v bsdType="$BSD_TYPE" -v swapSize="$swap_size" '
@ -7090,7 +7091,7 @@ get_hdd_temp_data()
{ {
eval $LOGFS eval $LOGFS
local hdd_temp='' sudo_command='' local hdd_temp='' sudo_command=''
if [[ $B_HDDTEMP_TESTED != 'true' ]];then if [[ $B_HDDTEMP_TESTED != 'true' ]];then
B_HDDTEMP_TESTED='true' B_HDDTEMP_TESTED='true'
HDDTEMP_PATH=$( type -p hddtemp ) HDDTEMP_PATH=$( type -p hddtemp )
@ -7374,7 +7375,7 @@ get_machine_data()
# System manufacturer|System Product Name|System Version # System manufacturer|System Product Name|System Version
# To Be Filled By O.E.M. # To Be Filled By O.E.M.
sub(/^Base Board .*|^Chassis .*|.*O\.E\.M\..*|.*OEM.*|^Not .*|^System .*|.*unknow.*|.*N\/A.*|none|^To be filled.*/, "", $0) sub(/^Base Board .*|^Chassis .*|.*O\.E\.M\..*|.*OEM.*|^Not .*|^System .*|.*unknow.*|.*N\/A.*|none|^To be filled.*/, "", $0)
gsub(/bios|acpi/, "", $0) gsub(/\ybios\y|\yacpi\y/, "", $0) # note: biostar
sub(/http:\/\/www.abit.com.tw\//, "Abit", $0) sub(/http:\/\/www.abit.com.tw\//, "Abit", $0)
gsub(/^ +| +$/, "", $0) gsub(/^ +| +$/, "", $0)
gsub(/ [ \t]+/, " ", $0) gsub(/ [ \t]+/, " ", $0)

18
inxi.changelog
View file

@ -1,3 +1,21 @@
=====================================================================================
Version: 2.3.7
Patch Version: 00
Script Date: 2016-12-24
-----------------------------------
Changes:
-----------------------------------
New version, new tarball. This fixes an issue where sloppy regex was removing the BIOS
from BIOSTAR. Also fixed a few other sloppy gsub, and fixed a few gensub errors as well.
Since BIOSTAR is a fairly common mobo, I'm surprised I haven't gotten this bug report
before.
This closes issue #102.
-----------------------------------
-- Harald Hope - Sat, 24 Dec 2016 14:53:31 -0800
===================================================================================== =====================================================================================
Version: 2.3.6 Version: 2.3.6
Patch Version: 00 Patch Version: 00