more fine tunings

This commit is contained in:
inxi-svn 2011-06-08 05:33:52 +00:00
parent 71c472b892
commit 55a281a794

8
inxi
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### version: 1.5.996 #### version: 1.5.997
#### Date: June 7 2011 #### Date: June 7 2011
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
@ -5966,14 +5966,14 @@ print_machine_data()
if [[ -z ${A_MACHINE_DATA[0]} ]];then if [[ -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 elif [[ -n ${A_MACHINE_DATA[0]} && ${A_MACHINE_DATA[0]} == ${A_MACHINE_DATA[5]} && \
-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) # 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 # 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 # 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 # mobo model string contains the system version data and the vendors are the same
if [[ ${A_MACHINE_DATA[1]} == ${A_MACHINE_DATA[6]} ]] || \ 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
-n $( grep ${A_MACHINE_DATA[1]} <<< ${A_MACHINE_DATA[6]} ) ]];then
b_skip_system='true' b_skip_system='true'
fi fi
fi fi