From dd5a96c38b15583e16e836520f095b33fea744f9 Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Sun, 1 May 2011 16:31:32 +0000 Subject: [PATCH] bug fix, simple, but requires a version update to force upgrades otherwise -N doesn't work right --- inxi | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/inxi b/inxi index 53e7f49..5fa9154 100755 --- a/inxi +++ b/inxi @@ -1,8 +1,8 @@ #!/bin/bash ######################################################################## #### Script Name: inxi -#### version: 1.4.94 -#### Date: April 30 2011 +#### version: 1.4.95 +#### Date: May 1 2011 ######################################################################## #### SPECIAL THANKS ######################################################################## @@ -469,7 +469,7 @@ BAN_LIST_CPU='' USB_NETWORK_SEARCH="Wi-Fi.*Adapter Wireless.*Adapter WLAN.*Adapter Network.*Adapter Atheros Atmel D-Link.*Adapter D-Link.*Wireless Linksys Netgear Ralink Realtek.*Network Realtek.*Wireless Realtek.*WLAN Belkin.*Wireless Belkin.*WLAN Belkin.*Network" USB_NETWORK_SEARCH="$USB_NETWORK_SEARCH Actiontec.*Wireless Actiontec.*Network AirLink.*Wireless Asus.*Network Asus.*Wireless Buffalo.*Wireless Davicom DWA-.*RangeBooster DWA-.*Wireless ENUWI-.*Wireless LG.*Wi-Fi 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 " # then a few known hard to ID ones added -# belkin=050d; netgear=0846; ralink=148f; realtek=0bda; +# belkin=050d; d-link=07d1; 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') @@ -3349,8 +3349,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 -Eisv '(bluetooth| hub|keyboard|mouse|printer| ps2|reader|scan|storage' ) ]];then + if [[ -n $( grep -isE "$needle" <<< "$lsusb_data" | grep -Eisv '(bluetooth| hub|keyboard|mouse|printer| ps2|reader|scan|storage)' ) ]];then card_data=$( grep -isE "$needle" <<< "$lsusb_data" ) break fi