Commit 29dfecff authored Oct 12, 2015 by Alexander Kapshuk Committed by Greg Kroah-Hartman Oct 17, 2015

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>

parent 7a343234

scripts/ver_linux

+6 −1

Original line number	Diff line number	Diff line
		@@ -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}'