mirror of https://gitee.com/openkylin/linux.git
ver_linux: net-tools, look for numerical input, not field number
Rely on regex to find the version number, rather than rely on numerical input to be found in a particular input field. Proposed implementation also eliminates the necessity to invoke 'grep' + 'awk'. Signed-off-by: Alexander Kapshuk <alexander.kapshuk@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
e7230872ce
commit
be6bb51a9f
|
@ -140,8 +140,12 @@ awk '/version/{
|
|||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
ifconfig --version 2>&1 | grep tools | awk \
|
||||
'NR==1{print "Net-tools ", $NF}'
|
||||
ifconfig --version 2>&1 |
|
||||
awk '/tools/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Net-tools\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
# Kbd needs 'loadkeys -h',
|
||||
loadkeys -h 2>&1 | awk \
|
||||
|
|
Loading…
Reference in New Issue