Commit 031c155a authored Oct 12, 2015 by Alexander Kapshuk Committed by Greg Kroah-Hartman Oct 17, 2015

ver_linux: wireless-tools, 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

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

parent 1245b7ec

scripts/ver_linux

+6 −2

Original line number	Diff line number	Diff line
		@@ -171,8 +171,12 @@ awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
		substr($0,RSTART,RLENGTH))
		}'

		iwconfig --version 2>&1 \| awk \
		'(NR==1 && ($3 == "version")) {print "wireless-tools ",$4}'
		iwconfig --version 2>&1 \|
		awk '/version/{
		match($0, /[0-9]+([.]?[0-9]+)+/)
		printf("Wireless-tools\t\t%s\n",
		substr($0,RSTART,RLENGTH))
		}'

		if [ -e /proc/modules ]; then
		X=`cat /proc/modules \| sed -e "s/ .*$//"`