aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kapshuk <alexander.kapshuk@gmail.com>2015-10-12 14:39:56 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-18 00:55:26 -0400
commite7230872ce44667003876f6ef6d3401636033453 (patch)
tree7495511ca0cf309eada8b9a1538b10de2dcb17d7
parent53494ba9dac543ffce5bc717556b111ca8c44b7e (diff)
ver_linux: procps, 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>
-rwxr-xr-xscripts/ver_linux8
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/ver_linux b/scripts/ver_linux
index 882ddb961b49..2269803dddb5 100755
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -133,8 +133,12 @@ sed '
133 s!.*so\.!! 133 s!.*so\.!!
134 s!^!Linux C++ Library\t! 134 s!^!Linux C++ Library\t!
135' 135'
136ps --version 2>&1 | grep version | awk \ 136ps --version 2>&1 |
137'NR==1{print "Procps ", $NF}' 137awk '/version/{
138 match($0, /[0-9]+([.]?[0-9]+)+/)
139 printf("Procps\t\t\t%s\n",
140 substr($0,RSTART,RLENGTH))
141}'
138 142
139ifconfig --version 2>&1 | grep tools | awk \ 143ifconfig --version 2>&1 | grep tools | awk \
140'NR==1{print "Net-tools ", $NF}' 144'NR==1{print "Net-tools ", $NF}'