dmitriy.kazimirov/inxi
1
0
Fork 0
mirror of https://github.com/smxi/inxi.git synced 2024-11-17 00:31:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

major fix for ip addr output, handled weak cases, now it inserts a newline before each record item with sed to create discrete records for gawk to parse easily.

Browse source 
this solves the problem exposed when there is no ipv6 output, and thus the last line used to test for end of record was vanished.

now it's all just treated like ifconfig except a few small differences of which item to slice out.
This commit is contained in:
inxi-svn 2011-06-25 01:17:16 +00:00
parent 507687cb63
commit d8c2368418
1 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
inxi
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### version: 1.7.11 #### version: 1.7.12
#### Date: June 24 2011 #### Date: June 24 2011
#### Patch Number: 00 #### Patch Number: 00
######################################################################## ########################################################################
@ -1310,6 +1310,7 @@ debug_data_collector()
xiin_data_file=$SCRIPT_DATA_DIR/$debug_data_dir/xiin-sys.txt xiin_data_file=$SCRIPT_DATA_DIR/$debug_data_dir/xiin-sys.txt
echo 'Collecting networking data...' echo 'Collecting networking data...'
ifconfig &> $debug_data_dir/ifconfig.txt ifconfig &> $debug_data_dir/ifconfig.txt
ip addr &> $debug_data_dir/ip-addr.txt
if [[ $b_run_xiin == 'true' ]];then if [[ $b_run_xiin == 'true' ]];then
echo "Running $xiin_file tool now on /sys..." echo "Running $xiin_file tool now on /sys..."
python ./$xiin_file -d /sys -f $xiin_data_file python ./$xiin_file -d /sys -f $xiin_data_file
@ -4524,7 +4525,7 @@ get_networking_local_ip_data()
eval $LOGFS eval $LOGFS
local ip_tool_command=$( type -p ip ) local ip_tool_command=$( type -p ip )
local temp_array='' ip_tool='ip' local temp_array='' ip_tool='ip' ip_tool_data=''
# the chances for all new systems to have ip by default are far higher than # the chances for all new systems to have ip by default are far higher than
# the deprecated ifconfig. Only try for ifconfig if ip is not present in system # the deprecated ifconfig. Only try for ifconfig if ip is not present in system
if [[ -z $ip_tool_command ]];then if [[ -z $ip_tool_command ]];then
@ -4533,12 +4534,22 @@ get_networking_local_ip_data()
else else
ip_tool_command="$ip_tool_command addr" ip_tool_command="$ip_tool_command addr"
fi fi
# lack of ip tool will throw an error only upon it's usage
if [[ -n "$ip_tool_command" ]];then if [[ -n "$ip_tool_command" ]];then
if [[ $ip_tool == 'ifconfig' ]];then
ip_tool_data="$( ifconfig )"
# note, ip addr does not have proper record separation, so creating new lines explicitly here at start
# of each IF record item. Also getting rid of the unneeded numeric line starters, now it can be parsed
# like ifconfig more or less
elif [[ $ip_tool == 'ip' ]];then
ip_tool_data="$( eval ${ip_tool_command} | sed 's/^[0-9]\+:[[:space:]]\+/\n/' )"
fi
fi
if [[ -z $ip_tool_command ]];then
A_INTERFACES_DATA=( "Interfaces program 'ip' missing. Please check: $SCRIPT_NAME --recommends" )
elif [[ -n "$ip_tool_data" ]];then
IFS=$'\n' # $ip_tool_command IFS=$'\n' # $ip_tool_command
A_INTERFACES_DATA=( $( A_INTERFACES_DATA=( $(
# important, because this can be 'ip addr' it MUST use eval ${...} gawk -v ipTool=$ip_tool '
eval ${ip_tool_command} | gawk -v ipTool=$ip_tool '
BEGIN { BEGIN {
IGNORECASE=1 IGNORECASE=1
interface="" interface=""
@ -4547,31 +4558,26 @@ get_networking_local_ip_data()
ifMask="" ifMask=""
} }
# skip past the lo item # skip past the lo item
/^lo/ || /^[0-9]+: lo:/ { /^lo/ {
while (getline && ( !/^$/ && !/valid(.*)lft/ ) ) { while (getline && !/^$/ ) {
# do nothing, just get past this entry item # do nothing, just get past this entry item
} }
} }
/^[a-zA-Z]+[0-9]/ || /^[0-9]+: [a-zA-Z]+[0-9]+:/ { /^[a-zA-Z]+[0-9]/ {
# not clear on why inet is coming through, but this gets rid of it # not clear on why inet is coming through, but this gets rid of it
# as first line item. # as first line item.
gsub(/,/, " ", $0) gsub(/,/, " ", $0)
gsub(/^ +| +$/, "", $0) gsub(/^ +| +$/, "", $0)
gsub(/ [ \t]+/, " ", $0) gsub(/ [ \t]+/, " ", $0)
if ( ipTool == "ifconfig" ) { interface = $1
interface = $1 # prep this this for ip addr: eth0:
} sub(/:/, "", interface)
# prep this this: 2: eth0:
else if ( ipTool == "ip" ) {
interface = $2
sub(/:/, "", interface)
}
ifIp="" ifIp=""
ifIpV6="" ifIpV6=""
ifMask="" ifMask=""
aInterfaces[interface]++ aInterfaces[interface]++
while (getline && ( !/^$/ && !/valid(.*)lft/ )) { while (getline && !/^$/ ) {
if ( ipTool == "ifconfig" ) { if ( ipTool == "ifconfig" ) {
if (/inet addr:/) { if (/inet addr:/) {
ifIp = gensub( /addr:([0-9\.]+)/, "\\1", "g", $2 ) ifIp = gensub( /addr:([0-9\.]+)/, "\\1", "g", $2 )
@ -4614,16 +4620,18 @@ get_networking_local_ip_data()
} }
j++ j++
} }
}' }' <<< "$ip_tool_data"
) ) ) )
IFS="$ORIGINAL_IFS" IFS="$ORIGINAL_IFS"
else else
A_INTERFACES_DATA=( "Interfaces program 'ip' missing. Please check: $SCRIPT_NAME --recommends" ) A_INTERFACES_DATA=( "Interfaces program $ip_tool present but created no data. " )
fi fi
temp_array=${A_INTERFACES_DATA[@]} temp_array=${A_INTERFACES_DATA[@]}
log_function_data "A_INTERFACES_DATA: $temp_array" log_function_data "A_INTERFACES_DATA: $temp_array"
eval $LOGFE eval $LOGFE
} }
# get_networking_local_ip_data;exit
# get_networking_local_ip_data;exit # get_networking_local_ip_data;exit
get_optical_drive_data() get_optical_drive_data()
{ {