aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/ver_linux
diff options
context:
space:
mode:
authorAlexander Kapshuk <alexander.kapshuk@gmail.com>2015-10-12 14:39:57 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-18 00:55:26 -0400
commitbe6bb51a9f6a60995e0069bfdd9e0611d78ae4c6 (patch)
tree717cf95402143aa0e7e6b3a5f0c64f0a6665619e /scripts/ver_linux
parente7230872ce44667003876f6ef6d3401636033453 (diff)
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-xscripts/ver_linux8
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/{
140 substr($0,RSTART,RLENGTH)) 140 substr($0,RSTART,RLENGTH))
141}' 141}'
142 142
143ifconfig --version 2>&1 | grep tools | awk \ 143ifconfig --version 2>&1 |
144'NR==1{print "Net-tools ", $NF}' 144awk '/tools/{
145 match($0, /[0-9]+([.]?[0-9]+)+/)
146 printf("Net-tools\t\t%s\n",
147 substr($0,RSTART,RLENGTH))
148}'
145 149
146# Kbd needs 'loadkeys -h', 150# Kbd needs 'loadkeys -h',
147loadkeys -h 2>&1 | awk \ 151loadkeys -h 2>&1 | awk \