ver_linux: procps, look for numerical input, not field number
authorAlexander Kapshuk <alexander.kapshuk@gmail.com>
Mon, 12 Oct 2015 18:39:56 +0000 (21:39 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 18 Oct 2015 04:55:26 +0000 (21:55 -0700)
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>
scripts/ver_linux

index 882ddb961b490524a154ed0c752fe04b085f198e..2269803dddb54298c7c776715223ad6e0fb9ac90 100755 (executable)
@@ -133,8 +133,12 @@ sed '
        s!.*so\.!!
        s!^!Linux C++ Library\t!
 '
-ps --version 2>&1 | grep version | awk \
-'NR==1{print "Procps                ", $NF}'
+ps --version 2>&1 |
+awk '/version/{
+       match($0, /[0-9]+([.]?[0-9]+)+/)
+       printf("Procps\t\t\t%s\n",
+       substr($0,RSTART,RLENGTH))
+}'
 
 ifconfig --version 2>&1 | grep tools | awk \
 'NR==1{print "Net-tools             ", $NF}'