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

added more wifi detection filters

Browse source
This commit is contained in:
inxi-svn 2011-06-09 01:51:46 +00:00
parent e25d0d12dd
commit d3505da78d
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
inxi
View file

@ -224,13 +224,13 @@ B_EXTRA_EXTRA_DATA='false'
# override certain errors due to currupted data # override certain errors due to currupted data
B_HANDLE_CORRUPT_DATA='false' B_HANDLE_CORRUPT_DATA='false'
B_LABEL_SET='false' B_LABEL_SET='false'
B_LAPTOP='false'
B_LOG_COLORS='false' B_LOG_COLORS='false'
B_LOG_FULL_DATA='false' B_LOG_FULL_DATA='false'
B_OUTPUT_FILTER='false' B_OUTPUT_FILTER='false'
B_OVERRIDE_FILTER='false' B_OVERRIDE_FILTER='false'
# kde qdbus # kde qdbus
B_QDBUS='false' B_QDBUS='false'
B_PORTABLE='false'
B_ROOT='false' B_ROOT='false'
B_RUN_COLOR_SELECTOR='false' B_RUN_COLOR_SELECTOR='false'
# Running in a shell? Defaults to false, and is determined later. # Running in a shell? Defaults to false, and is determined later.
@ -673,7 +673,7 @@ initialize_script_data()
fi fi
# found a case of battery existing but having nothing in it on desktop mobo # found a case of battery existing but having nothing in it on desktop mobo
if [[ -n $( ls /proc/acpi/battery 2>/dev/null ) ]];then if [[ -n $( ls /proc/acpi/battery 2>/dev/null ) ]];then
B_LAPTOP='true' B_PORTABLE='true'
fi fi
if [[ -e $FILE_CPUINFO ]]; then if [[ -e $FILE_CPUINFO ]]; then
B_CPUINFO_FILE='true' B_CPUINFO_FILE='true'
@ -3786,7 +3786,8 @@ get_machine_data()
{ {
gsub(/'"$BAN_LIST_NORMAL"'/, "", $0) gsub(/'"$BAN_LIST_NORMAL"'/, "", $0)
gsub(/,/, " ", $0) gsub(/,/, " ", $0)
sub(/To Be Filled By O.E.M.|Not Available|Not Applicable|System manufacturer|System Product Name|System Version|unknown|unknow|N\/A|OEM|none/, "", $0) # yes, there is a typo in a user data set, unknow # yes, there is a typo in a user data set, unknow
sub(/To Be Filled By O.E.M.|Not Available|Not Applicable|System manufacturer|System Product Name|System Version|unknown|unknow|N\/A|OEM|none/, "", $0)
gsub(/bios|acpi/, "", $0) gsub(/bios|acpi/, "", $0)
sub(/http:\/\/www.abit.com.tw\//, "Abit", $0) sub(/http:\/\/www.abit.com.tw\//, "Abit", $0)
gsub(/^ +| +$/, "", $0) gsub(/^ +| +$/, "", $0)
@ -5974,7 +5975,7 @@ 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'
else else
if [[ $B_LAPTOP != 'true' ]];then if [[ $B_PORTABLE != '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
@ -6053,7 +6054,7 @@ print_machine_data()
else else
# this has already been tested for above so we know it's not null # this has already been tested for above so we know it's not null
system_vendor=${A_MACHINE_DATA[0]} system_vendor=${A_MACHINE_DATA[0]}
if [[ $B_LAPTOP == 'true' ]];then if [[ $B_PORTABLE == 'true' ]];then
system_vendor="$system_vendor (portable)" system_vendor="$system_vendor (portable)"
fi fi
if [[ -n ${A_MACHINE_DATA[1]} ]];then if [[ -n ${A_MACHINE_DATA[1]} ]];then
@ -6234,7 +6235,7 @@ print_network_advanced_data()
if [[ $B_SHOW_ADVANCED_NETWORK == 'true' ]];then if [[ $B_SHOW_ADVANCED_NETWORK == 'true' ]];then
# first check if it's a known wifi id'ed card, if so, no print of duplex/speed # first check if it's a known wifi id'ed card, if so, no print of duplex/speed
if [[ -n $( grep -Esi '(wireless|wifi|wi-fi|wlan|802\.11)' <<< ${a_network_working[0]} ) ]];then if [[ -n $( grep -Esi '(wireless|wifi|wi-fi|wlan|802\.11|centrino)' <<< ${a_network_working[0]} ) ]];then
b_is_wifi='true' b_is_wifi='true'
fi fi
if [[ -n ${a_network_working[5]} ]];then if [[ -n ${a_network_working[5]} ]];then