branches one, fix of more bugs, -i/-n should now work in most cases again

This commit is contained in:
inxi-svn 2014-07-25 16:08:51 +00:00
parent ac057dd0ab
commit 593b14d8de

9
inxi
View file

@ -2,8 +2,8 @@
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### Version: 2.1.28 #### Version: 2.1.28
#### Date: 2014-07-24 #### Date: 2014-07-25
#### Patch Number: 05-b1 #### Patch Number: 06-b1
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
######################################################################## ########################################################################
@ -6417,7 +6417,9 @@ get_network_advanced_data()
local if_id='' speed='' duplex='' mac_id='' oper_state='' chip_id='' b_path_made='true' local if_id='' speed='' duplex='' mac_id='' oper_state='' chip_id='' b_path_made='true'
local usb_data='' usb_vendor='' usb_product='' product_path='' driver_test='' array_counter=0 local usb_data='' usb_vendor='' usb_product='' product_path='' driver_test='' array_counter=0
# we need to change to holder since we are updating the main array # we need to change to holder since we are updating the main array
local a_main_working=${A_NETWORK_DATA[@]} IFS=$'\n'
local a_main_working=(${A_NETWORK_DATA[@]})
IFS="$ORIGINAL_IFS"
for (( i=0; i < ${#a_main_working[@]}; i++ )) for (( i=0; i < ${#a_main_working[@]}; i++ ))
do do
@ -6448,6 +6450,7 @@ get_network_advanced_data()
elif [[ -d /sys/devices/pci0000:00/ ]];then elif [[ -d /sys/devices/pci0000:00/ ]];then
working_path="/sys/devices/pci0000:00/0000:00:01.0/0000:${a_network_adv_working[4]}" working_path="/sys/devices/pci0000:00/0000:00:01.0/0000:${a_network_adv_working[4]}"
fi fi
#echo wp ${a_network_adv_working[4]} $i
# now we want the real one, that xiin also displays, without symbolic links. # now we want the real one, that xiin also displays, without symbolic links.
if [[ -n $working_path && -e $working_path ]];then if [[ -n $working_path && -e $working_path ]];then
working_path=$( readlink -f $working_path 2>/dev/null ) working_path=$( readlink -f $working_path 2>/dev/null )