ver_linux: sh-utils, 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.

Tested on:
Gentoo Linux
Debian 6.0.10
Oracle Linux Server release 7.1

Signed-off-by: Alexander Kapshuk <alexander.kapshuk@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/scripts/ver_linux b/scripts/ver_linux
index e6b57d57df980e0b2ad930aaa2a0e5e6ba26ffd4..1c6ec2244ae8ed31b8ca3e044b22f8f36ca95cbb 100755 (executable)
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -157,7 +157,12 @@ awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
 oprofiled --version 2>&1 | awk \
 '(NR==1 && ($2 == "oprofile")) {print "oprofile              ", $3}'
 
-expr --v 2>&1 | awk 'NR==1{print "Sh-utils              ", $NF}'
+expr --v 2>&1 |
+awk '/^expr/{
+       match($0, /[0-9]+([.]?[0-9]+)+/)
+       printf("Sh-utils\t\t%s\n",
+       substr($0,RSTART,RLENGTH))
+}'
 
 udevinfo -V 2>&1 | grep version | awk '{print "udev                  ", $3}'