fixes and twaeks

This commit is contained in:
inxi-svn 2008-11-21 02:14:10 +00:00
parent cde3d78ac4
commit 3c5dcc1b1a

8
inxi
View file

@ -1028,8 +1028,6 @@ get_audio_data()
#/^[0-9a-f:.]+ (ethernet|network) (controller|bridge)/ || /^[0-9a-f:.]+ [^:]+: .*(ethernet|network).*$/ { #/^[0-9a-f:.]+ (ethernet|network) (controller|bridge)/ || /^[0-9a-f:.]+ [^:]+: .*(ethernet|network).*$/ {
/multimedia audio controller|audio device/ { /multimedia audio controller|audio device/ {
audioCard=gensub(/^[0-9a-f:.]+ [^:]+: (.+)$/,"\\1","g",$0) audioCard=gensub(/^[0-9a-f:.]+ [^:]+: (.+)$/,"\\1","g",$0)
gsub(/realtek semiconductor/, "Realtek", audioCard)
gsub(/davicom semiconductor/, "Davicom", audioCard)
# The doublequotes are necessary because of the pipes in the variable. # The doublequotes are necessary because of the pipes in the variable.
gsub(/'"$BAN_LIST_NORMAL"'/, "", audioCard) gsub(/'"$BAN_LIST_NORMAL"'/, "", audioCard)
gsub(/,/, " ", audioCard) gsub(/,/, " ", audioCard)
@ -1906,7 +1904,7 @@ get_networking_data()
ports[nic] = ports[nic] $4 " " ports[nic] = ports[nic] $4 " "
} }
if (/driver in use/) { if (/driver in use/) {
drivers[nic] = drivers[nic] gensub(/(.*): (.*)/,"\\2","g",$0) " " drivers[nic] = drivers[nic] gensub(/(.*): (.*)/,"\\2","g",$0) ""
} }
} }
} }
@ -2562,7 +2560,7 @@ print_networking_data()
driver_data=" ${C1}driver${C2} ${a_network_working[1]}" driver_data=" ${C1}driver${C2} ${a_network_working[1]}"
fi fi
if [[ -n ${a_network_working[2]} && $B_EXTRA_DATA == 'true' ]];then if [[ -n ${a_network_working[2]} && $B_EXTRA_DATA == 'true' ]];then
port_data="${C1}at port${C2} ${a_network_working[2]}" port_data=" ${C1}at port${C2} ${a_network_working[2]}"
fi fi
network_data="${C1}$card_one${C2}${a_network_working[0]}$driver_data$port_data" network_data="${C1}$card_one${C2}${a_network_working[0]}$driver_data$port_data"
network_data=$( create_print_line "Network:" "$network_data" ) network_data=$( create_print_line "Network:" "$network_data" )
@ -2579,7 +2577,7 @@ print_networking_data()
driver_data=" ${C1}driver${C2} ${a_network_working[1]}" driver_data=" ${C1}driver${C2} ${a_network_working[1]}"
fi fi
if [[ -n ${a_network_working[2]} && $B_EXTRA_DATA == 'true' ]];then if [[ -n ${a_network_working[2]} && $B_EXTRA_DATA == 'true' ]];then
port_data="${C1}at port${C2} ${a_network_working[2]}" port_data=" ${C1}at port${C2} ${a_network_working[2]}"
fi fi
network_data="${C1}Card-$(( $i + 1 )) ${C2}${a_network_working[0]}$driver_data$port_data" network_data="${C1}Card-$(( $i + 1 )) ${C2}${a_network_working[0]}$driver_data$port_data"
network_data=$( create_print_line " " "$network_data" ) network_data=$( create_print_line " " "$network_data" )