From 55a281a794ad142ff1a555dbbda8e94a0f43e16f Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Wed, 8 Jun 2011 05:33:52 +0000 Subject: [PATCH] more fine tunings --- inxi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/inxi b/inxi index ab4effd..bb7c131 100755 --- a/inxi +++ b/inxi @@ -1,7 +1,7 @@ #!/bin/bash ######################################################################## #### Script Name: inxi -#### version: 1.5.996 +#### version: 1.5.997 #### Date: June 7 2011 ######################################################################## #### SPECIAL THANKS @@ -5966,14 +5966,14 @@ print_machine_data() if [[ -z ${A_MACHINE_DATA[0]} ]];then 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) # 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 + [[ -n $( grep ${A_MACHINE_DATA[1]} <<< ${A_MACHINE_DATA[6]} ) ]];then b_skip_system='true' fi fi