diff options
| author | Alexander Kapshuk <alexander.kapshuk@gmail.com> | 2015-10-12 21:39:57 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-17 21:55:26 -0700 |
| commit | be6bb51a9f6a60995e0069bfdd9e0611d78ae4c6 (patch) | |
| tree | 717cf95402143aa0e7e6b3a5f0c64f0a6665619e /scripts/ver_linux | |
| parent | e7230872ce44667003876f6ef6d3401636033453 (diff) | |
| download | linux-stable-be6bb51a9f6a60995e0069bfdd9e0611d78ae4c6.tar.gz linux-stable-be6bb51a9f6a60995e0069bfdd9e0611d78ae4c6.tar.bz2 linux-stable-be6bb51a9f6a60995e0069bfdd9e0611d78ae4c6.zip | |
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>
Diffstat (limited to 'scripts/ver_linux')
| -rwxr-xr-x | scripts/ver_linux | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/ver_linux b/scripts/ver_linux index 2269803dddb5..4ef1b7d370a9 100755 --- a/scripts/ver_linux +++ b/scripts/ver_linux @@ -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 \ |