diff --git a/inxi b/inxi index e425f63..92d1ab2 100755 --- a/inxi +++ b/inxi @@ -1,7 +1,7 @@ #!/bin/bash ######################################################################## #### Script Name: inxi -#### version: 1.4.93 +#### version: 1.4.94 #### Date: April 30 2011 ######################################################################## #### SPECIAL THANKS @@ -465,7 +465,7 @@ BAN_LIST_CPU='' ### USB networking search string data, because some brands can have other products than ### wifi/nic cards, they need further identifiers, with wildcards. -USB_NETWORK_SEARCH="Atmel Davicom Linksys Netgear Realtek.*Network Realtek.*Wireless Realtek.*WLAN" +USB_NETWORK_SEARCH="AirLink.*Wireless Atmel Belkin.*Wireless Belkin.*WLAN Belkin.*Network Buffalo.*Wireless D-Link.*Adapter D-Link.*Wireless Davicom DWA-.*RangeBooster DWA-.*Wireless ENUWI-.*Wireless LG.*Wi-Fi Linksys Netgear Realtek.*Network Realtek.*Wireless Realtek.*WLAN Rosewill.*Wireless RNX-.Wireless Samsung.*LinkStick Samsung.*Wireless Sony.*Wireless TEW-.*Wireless TP-Link.*Wireless WG[0-9]{3}.*Wireless WNA[0-9]{3} WNDA[0-9]{3} Zonet.*ZEW.*Wireless Wi-Fi.*Adapter Wireless.*Adapter WLAN.*Adapter" # WARNING: In the main part below (search for 'KONVI') # there's a check for Konversation-specific config files. @@ -3337,7 +3337,7 @@ get_networking_data() lsusb_data="$( $lsusb_path 2>/dev/null )" for needle in $USB_NETWORK_SEARCH do - if [[ -n $( grep -isE "$needle" <<< "$lsusb_data" ) ]];then + if [[ -n $( grep -isE "$needle" <<< "$lsusb_data" | grep -isv 'bluetooth' ) ]];then card_data=$( grep -isE "$needle" <<< "$lsusb_data" ) fi done @@ -3437,6 +3437,7 @@ get_network_advanced_data() fi fi # /sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2/2-1.2:1.0/uevent grep for DRIVER= + # /sys/devices/pci0000:00/0000:00:0b.1/usb1/1-1/1-1:1.0/uevent if [[ -n $usb_data ]];then driver_test=$( grep -si 'DRIVER=' $working_path/uevent | cut -d '=' -f 2 ) if [[ -n $driver_test ]];then