added some ban list terms, tweaked a few things

This commit is contained in:
inxi-svn 2011-06-08 03:48:54 +00:00
parent e11e85e93d
commit 931ecb4968

9
inxi
View file

@ -1,7 +1,7 @@
#!/bin/bash
########################################################################
#### Script Name: inxi
#### version: 1.5.98
#### version: 1.5.99
#### Date: June 7 2011
########################################################################
#### SPECIAL THANKS
@ -472,7 +472,7 @@ DISTROS_LSB_GOOD="mandrake-release mandriva-release mandrakelinux-release"
# $'\1' gets weird results :
# user@host $ ARR=($'\x01'"one two" three four); echo ${ARR[0]} | hd -v
# 00000000 01 01 6f 6e 65 20 74 77 6f 0a |..one two.|
A_NORMAL_BANS=( corporation communications gmbh technologies technology group $'\2'"\<ltd\>" ltd. ltd $'\2'"\<inc\>" inc. $'\2'\<co\> co. corp. "(tm)" "(r)" "®" $'\2'"\(rev ..\)" )
A_NORMAL_BANS=( corporation communications gmbh group international software technologies technology $'\2'"\<ltd\>" ltd. ltd $'\2'"\<inc\>" intl. inc. $'\2'\<co\> co. corp. "(tm)" "(r)" "®" $'\2'"\(rev ..\)" )
A_CPU_BANS=( @ cpu deca 'dual core' dual-core 'tri core' tri-core 'quad core' quad-core ennea genuine hepta hexa multi octa penta 'processor' processor single triple $'\2'"[0-9.]+ *[MmGg][Hh][Zz]" )
# after processing, the ban arrays will be put into these:
BAN_LIST_NORMAL=''
@ -6049,6 +6049,11 @@ print_machine_data()
product_serial=" ${C1}serial${C2} ${A_MACHINE_DATA[3]} "
fi
system_line="${C1}System${C2} $system_vendor ${C1}product${C2} $product_name ${C1}version${C2} $product_version$product_serial"
if [[ $( wc -c <<< "$system_line$chassis_line" ) -lt $line_max ]];then
system_line="$system_line $chassis_line"
chassis_line=''
fi
fi
fi
IFS="$ORIGINAL_IFS"
else