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

ver_linux: reiserfsprogs, 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 0fc8de56

scripts/ver_linux

+6 −2

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

		reiserfsck -V 2>&1 \| grep ^reiserfsck \| awk \
		'NR==1{print "reiserfsprogs ", $2}'
		reiserfsck -V 2>&1 \|
		awk '/^reiserfsck/{
		match($0, /[0-9]+([.]?[0-9]+)+/)
		printf("Reiserfsprogs\t\t%s\n",
		substr($0,RSTART,RLENGTH))
		}'

		fsck.reiser4 -V 2>&1 \| grep ^fsck.reiser4 \| awk \
		'NR==1{print "reiser4progs ", $2}'