diff options
| author | Alexander Kapshuk <alexander.kapshuk@gmail.com> | 2015-10-12 21:39:47 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-17 21:55:26 -0700 |
| commit | 0fc8de5638e8668df65a4cbeb4ee3e4319b6eaec (patch) | |
| tree | 151ac8860ab956cfa8f85901e29892b918f2df1a | |
| parent | a8782227598084d95358c08a6d3d6ea84422af11 (diff) | |
| download | lwn-0fc8de5638e8668df65a4cbeb4ee3e4319b6eaec.tar.gz lwn-0fc8de5638e8668df65a4cbeb4ee3e4319b6eaec.zip | |
ver_linux: jfsutils, 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'.
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 2e1929f2c9de..7d85447d2ba5 100755 --- a/scripts/ver_linux +++ b/scripts/ver_linux @@ -53,8 +53,12 @@ awk '/^tune2fs/{ substr($0,RSTART,RLENGTH)) }' -fsck.jfs -V 2>&1 | grep version | sed 's/,//' | awk \ -'NR==1 {print "jfsutils ", $3}' +fsck.jfs -V 2>&1 | +awk '/version/{ + match($0, /[0-9]+([.]?[0-9]+)+/) + printf("Jfsutils\t\t%s\n", + substr($0,RSTART,RLENGTH)) +}' reiserfsck -V 2>&1 | grep ^reiserfsck | awk \ 'NR==1{print "reiserfsprogs ", $2}' |