2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-16 01:04:08 +08:00

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: Alexander Kapshuk <alexander.kapshuk@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alexander Kapshuk 2015-10-12 21:39:46 +03:00 committed by Greg Kroah-Hartman
parent 5bcb2f5924
commit a878222759

View File

@ -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}'