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

trying another way of handling false system/mobo data matches, msi is the culprit here

Browse source
This commit is contained in:
inxi-svn 2011-06-08 05:13:55 +00:00
parent b6d2786ea6
commit bba4e30abd
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
inxi
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### version: 1.5.993 #### version: 1.5.994
#### Date: June 7 2011 #### Date: June 7 2011
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
@ -5963,10 +5963,19 @@ print_machine_data()
if [[ ${#A_MACHINE_DATA[@]} -gt 0 ]];then if [[ ${#A_MACHINE_DATA[@]} -gt 0 ]];then
# note: in some case a mobo/version will match a product name/version, do not print those # note: in some case a mobo/version will match a product name/version, do not print those
# some special cases, with: System MSI product MS-7680/Mobo MSI model H61M-P23 (MS-7680)
if [[ -n ${A_MACHINE_DATA[1]} && -n ${A_MACHINE_DATA[6]} && ${A_MACHINE_DATA[1]} == ${A_MACHINE_DATA[6]} ]] || \ if [[ -z ${A_MACHINE_DATA[0]} ]];then
[[ -z ${A_MACHINE_DATA[0]} ]];then
b_skip_system='true' b_skip_system='true'
elif [[ -n ${A_MACHINE_DATA[1]} && -n ${A_MACHINE_DATA[6]} ]];then
# some special cases, with: System MSI product MS-7680/Mobo MSI model H61M-P23 (MS-7680)
# do not match, but I think the data is worth keeping since the first string might be the
# actual version number you see on the box of the mobo. So here we dump system if the longer
# mobo model string contains the system version data and the vendors are the same
if [[ ${A_MACHINE_DATA[1]} == ${A_MACHINE_DATA[6]} ]] || \
[[ -n ${A_MACHINE_DATA[0]} && ${A_MACHINE_DATA[0]} == ${A_MACHINE_DATA[5]} && \
-n $( grep ${A_MACHINE_DATA[1]} <<< ${A_MACHINE_DATA[6]} ) ]];then
b_skip_system='true'
fi
fi fi
# no point in showing chassis if system isn't there, it's very unlikely that would be correct # no point in showing chassis if system isn't there, it's very unlikely that would be correct
if [[ $B_EXTRA_EXTRA_DATA == 'true' && $b_skip_system != 'true' ]];then if [[ $B_EXTRA_EXTRA_DATA == 'true' && $b_skip_system != 'true' ]];then