From 6df9f15527b55511ea0c1daecc97579c445ec6f9 Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Sat, 30 Apr 2011 19:14:27 +0000 Subject: [PATCH] cleaned up code a bit --- inxi | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/inxi b/inxi index 7454e1c..e425f63 100755 --- a/inxi +++ b/inxi @@ -3413,14 +3413,18 @@ get_network_advanced_data() usb_product=$( cut -d ':' -f 2 <<< $usb_data ) # this grep returns the path plus the contents of the file, with a colon separator, so slice that off # /sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.1/idVendor - working_path=$( grep -s "$usb_vendor" /sys/devices/pci*/*/usb*/*/*/idVendor | sed -e "s/idVendor:$usb_vendor//" -e '/driver/d' ) + working_path=$( grep -s "$usb_vendor" /sys/devices/pci*/*/usb*/*/*/idVendor | \ + sed -e "s/idVendor:$usb_vendor//" -e '/driver/d' ) # try an alternate path if first one doesn't work # /sys/devices/pci0000:00/0000:00:0b.1/usb1/1-1/idVendor if [[ -z $working_path ]];then - working_path=$( grep -s "$usb_vendor" /sys/devices/pci*/*/usb*/*/idVendor | sed -e "s/idVendor:$usb_vendor//" -e '/driver/d' ) - product_path=$( grep -s "$usb_product" /sys/devices/pci*/*/usb*/*/idProduct | sed -e "s/idProduct:$usb_product//" -e '/driver/d' ) + working_path=$( grep -s "$usb_vendor" /sys/devices/pci*/*/usb*/*/idVendor | \ + sed -e "s/idVendor:$usb_vendor//" -e '/driver/d' ) + product_path=$( grep -s "$usb_product" /sys/devices/pci*/*/usb*/*/idProduct | \ + sed -e "s/idProduct:$usb_product//" -e '/driver/d' ) else - product_path=$( grep -s "$usb_product" /sys/devices/pci*/*/usb*/*/*/idProduct | sed -e "s/idProduct:$usb_product//" -e '/driver/d' ) + product_path=$( grep -s "$usb_product" /sys/devices/pci*/*/usb*/*/*/idProduct | \ + sed -e "s/idProduct:$usb_product//" -e '/driver/d' ) fi # make sure it's the right product/vendor match here, it will almost always be but let's be sure