summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kapshuk <alexander.kapshuk@gmail.com>2015-10-12 21:39:59 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-17 21:55:26 -0700
commit29dfecff10f3e1c8b4e2c7e390434d4932c4542f (patch)
treed3682f545c1f5162a541783370ce9664ce92851c
parent7a343234ed967de0c59cdbbf5629e6d762259549 (diff)
downloadlinux-29dfecff10f3e1c8b4e2c7e390434d4932c4542f.tar.bz2
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>
-rwxr-xr-xscripts/ver_linux7
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/ver_linux b/scripts/ver_linux
index e6b57d57df98..1c6ec2244ae8 100755
--- 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}'