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

final bug fixes, if google svn ever starts working again

Browse source
This commit is contained in:
inxi-svn 2011-06-08 08:42:28 +00:00
parent 4e31e4502c
commit 5654a8bffd
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
inxi
View file

@ -5969,19 +5969,22 @@ 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
# but for laptops, or even falsely id'ed desktops with batteries, let's print it all if it matches # but for laptops, or even falsely id'ed desktops with batteries, let's print it all if it matches
if [[ $B_LAPTOP != 'true' ]];then # there can be false id laptops if battery appears so need to make sure system is filled
if [[ -z ${A_MACHINE_DATA[0]} ]];then if [[ -z ${A_MACHINE_DATA[0]} ]];then
b_skip_system='true' b_skip_system='true'
else
if [[ $B_LAPTOP != 'true' ]];then
# ibm / ibm can be true; dell / quantum is false, so in other words, only do this # ibm / ibm can be true; dell / quantum is false, so in other words, only do this
# in case where the vendor is the same and the version is the same and not null, # in case where the vendor is the same and the version is the same and not null,
# otherwise the version information is going to be different in all cases I think # otherwise the version information is going to be different in all cases I think
elif [[ ${A_MACHINE_DATA[0]} == ${A_MACHINE_DATA[5]} ]];then if [[ -n ${A_MACHINE_DATA[0]} && ${A_MACHINE_DATA[0]} == ${A_MACHINE_DATA[5]} ]];then
if [[ -n ${A_MACHINE_DATA[2]} && ${A_MACHINE_DATA[2]} == ${A_MACHINE_DATA[7]} ]] || \ if [[ -n ${A_MACHINE_DATA[2]} && ${A_MACHINE_DATA[2]} == ${A_MACHINE_DATA[7]} ]] || \
[[ -z ${A_MACHINE_DATA[2]} && ${A_MACHINE_DATA[1]} == ${A_MACHINE_DATA[6]} ]];then [[ -z ${A_MACHINE_DATA[2]} && ${A_MACHINE_DATA[1]} == ${A_MACHINE_DATA[6]} ]];then
b_skip_system='true' b_skip_system='true'
fi fi
fi fi
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
if [[ -n ${A_MACHINE_DATA[7]} && ${A_MACHINE_DATA[14]} == ${A_MACHINE_DATA[7]} ]];then if [[ -n ${A_MACHINE_DATA[7]} && ${A_MACHINE_DATA[14]} == ${A_MACHINE_DATA[7]} ]];then