Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8782227 authored by Alexander Kapshuk's avatar Alexander Kapshuk Committed by Greg Kroah-Hartman
Browse files

ver_linux: e2fsprogs, 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' + 'sed' + 'awk'.

Tested on:
Gentoo Linux
Debian 6.0.10
Oracle Linux Server release 7.1

Signed-off-by: default avatarAlexander Kapshuk <alexander.kapshuk@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5bcb2f59

scripts/ver_linux

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

}'



tune2fs 2>&1 | grep "^tune2fs" | sed 's/,//' |  awk \

'NR==1 {print "e2fsprogs             ", $2}'

tune2fs 2>&1 |

awk '/^tune2fs/{

	match($0, /[0-9]+([.]?[0-9]+)+/)

	printf("E2fsprogs\t\t%s\n",

	substr($0,RSTART,RLENGTH))

}'



fsck.jfs -V 2>&1 | grep version | sed 's/,//' |  awk \

'NR==1 {print "jfsutils              ", $3}'