diff options
author | Alexander Kapshuk <alexander.kapshuk@gmail.com> | 2015-10-12 14:39:46 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-18 00:55:26 -0400 |
commit | a8782227598084d95358c08a6d3d6ea84422af11 (patch) | |
tree | ed40927de69eed9a6c96b520876572738e4b6ca3 | |
parent | 5bcb2f59240cb5501956f2a089ba82e0b8621564 (diff) |
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>
-rwxr-xr-x | scripts/ver_linux | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/ver_linux b/scripts/ver_linux index 7cc74d15e7f1..2e1929f2c9de 100755 --- a/scripts/ver_linux +++ b/scripts/ver_linux | |||
@@ -46,8 +46,12 @@ awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{ | |||
46 | substr($0,RSTART,RLENGTH)) | 46 | substr($0,RSTART,RLENGTH)) |
47 | }' | 47 | }' |
48 | 48 | ||
49 | tune2fs 2>&1 | grep "^tune2fs" | sed 's/,//' | awk \ | 49 | tune2fs 2>&1 | |
50 | 'NR==1 {print "e2fsprogs ", $2}' | 50 | awk '/^tune2fs/{ |
51 | match($0, /[0-9]+([.]?[0-9]+)+/) | ||
52 | printf("E2fsprogs\t\t%s\n", | ||
53 | substr($0,RSTART,RLENGTH)) | ||
54 | }' | ||
51 | 55 | ||
52 | fsck.jfs -V 2>&1 | grep version | sed 's/,//' | awk \ | 56 | fsck.jfs -V 2>&1 | grep version | sed 's/,//' | awk \ |
53 | 'NR==1 {print "jfsutils ", $3}' | 57 | 'NR==1 {print "jfsutils ", $3}' |