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>

diff --git a/scripts/ver_linux b/scripts/ver_linux
index 7d85447d2ba5ddbc007b1818763f0364ed294b5b..65d4c023071283cb296c3f607502a311d858798c 100755 (executable)
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -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}'