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

ver_linux: net-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.
Proposed implementation also eliminates the necessity to invoke 'grep' + 'awk'.

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

parent e7230872

scripts/ver_linux

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -140,8 +140,12 @@ awk '/version/{
	substr($0,RSTART,RLENGTH))		substr($0,RSTART,RLENGTH))
	}'		}'

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

	# Kbd needs 'loadkeys -h',		# Kbd needs 'loadkeys -h',
	loadkeys -h 2>&1 \| awk \		loadkeys -h 2>&1 \| awk \