From 8ca542bf1ae0a9af06db44f9a4013e172f40e364 Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Sat, 30 Apr 2011 22:32:39 +0000 Subject: [PATCH] more fine tuning for usb detection --- inxi | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/inxi b/inxi index 92d1ab2..78cb581 100755 --- a/inxi +++ b/inxi @@ -465,7 +465,10 @@ 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="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" +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 Ralink 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" +# then a few known hard to ID ones added +# belkin=050d; netgear=0846; ralink=148f; realtek=0bda; +USB_NETWORK_SEARCH="$USB_NETWORK_SEARCH 050d:935b 0bda:8189 0bda:8197" # WARNING: In the main part below (search for 'KONVI') # there's a check for Konversation-specific config files. @@ -3337,7 +3340,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" | grep -isv 'bluetooth' ) ]];then + if [[ -n $( grep -isE "$needle" <<< "$lsusb_data" | grep -Eisv '(bluetooth| hub|keyboard|mouse' ) ]];then card_data=$( grep -isE "$needle" <<< "$lsusb_data" ) fi done