commit 29dfecff10f3e1c8b4e2c7e390434d4932c4542f
author Alexander Kapshuk <alexander.kapshuk@gmail.com> Mon Oct 12 21:39:59 2015 +0300
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> Sat Oct 17 21:55:26 2015 -0700
tree d3682f545c1f5162a541783370ce9664ce92851c
parent 7a343234ed967de0c59cdbbf5629e6d762259549

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>

scripts/ver_linux

diff --git a/scripts/ver_linux b/scripts/ver_linux
index e6b57d5..1c6ec22 100755
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -157,7 +157,12 @@
 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}'