From 68b84a9e1e20532f05794b96fc09e1e7a19dd9be Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Tue, 22 Nov 2011 06:31:28 +0000 Subject: [PATCH] bug fix, first patch, usb networking wasn't working, not sure why this was never reported --- inxi | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/inxi b/inxi index 8b083e1..a81d31a 100755 --- a/inxi +++ b/inxi @@ -3,7 +3,7 @@ #### Script Name: inxi #### version: 1.7.26 #### Date: November 21 2011 -#### Patch Number: 00 +#### Patch Number: 01 ######################################################################## #### SPECIAL THANKS ######################################################################## @@ -285,6 +285,7 @@ B_SHOW_X_DATA='false' B_TESTING_1='false' B_TESTING_2='false' B_UPLOAD_DEBUG_DATA='false' +B_USB_NETWORKING='false' # set to true here for debug logging from script start B_USE_LOGGING='false' B_UUID_SET='false' @@ -502,7 +503,7 @@ SENSORS_GPU_SEARCH='intel|radeon|nouveau' ### wifi/nic cards, they need further identifiers, with wildcards. ### putting the most common and likely first, then the less common, then some specifics USB_NETWORK_SEARCH="Wi-Fi.*Adapter|Wireless.*Adapter|WLAN.*Adapter|Network.*Adapter|802\.11|Atheros|Atmel|D-Link.*Adapter|D-Link.*Wireless|Linksys|Netgea|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][0-9][0-9].*Wireless|WNA[0-9][0-9][0-9]|WNDA[0-9][0-9][0-9]|Zonet.*ZEW.*Wireless" +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][0-9][0-9].*Wireless|WNA[0-9][0-9][0-9]|WNDA[0-9][0-9][0-9]|Zonet.*ZEW.*Wireless|54 Mbps" # then a few known hard to ID ones added # belkin=050d; d-link=07d1; netgear=0846; ralink=148f; realtek=0bda; USB_NETWORK_SEARCH="$USB_NETWORK_SEARCH|050d:935b|0bda:8189|0bda:8197" @@ -4359,7 +4360,7 @@ get_networking_data() { eval $LOGFS - local b_usb_networking='false' temp_array='' + local B_USB_NETWORKING='false' temp_array='' IFS=$'\n' A_NETWORK_DATA=( $( @@ -4433,9 +4434,8 @@ get_networking_data() }' ) ) IFS="$ORIGINAL_IFS" - b_usb_networking=$( get_networking_usb_data ) - - if [[ $B_SHOW_ADVANCED_NETWORK == 'true' || $b_usb_networking == 'true' ]];then + get_networking_usb_data + if [[ $B_SHOW_ADVANCED_NETWORK == 'true' || $B_USB_NETWORKING == 'true' ]];then get_network_advanced_data fi temp_array=${A_NETWORK_DATA[@]} @@ -4570,7 +4570,7 @@ get_network_advanced_data() get_networking_usb_data() { eval $LOGFS - local lsusb_path='' lsusb_data='' a_usb='' array_count='' b_usb_networking='false' + local lsusb_path='' lsusb_data='' a_usb='' array_count='' # now we'll check for usb wifi, a work in progress # USB_NETWORK_SEARCH @@ -4619,12 +4619,11 @@ get_networking_usb_data() done # need this to get the driver data for -N regular output, but no need # to run the advanced stuff unless required - b_usb_networking='true' + B_USB_NETWORKING='true' fi fi fi - echo $b_usb_networking - +# echo $B_USB_NETWORKING eval $LOGFE }