summaryrefslogtreecommitdiffstats
path: root/scripts/ver_linux
diff options
context:
space:
mode:
authorAlexander Kapshuk <alexander.kapshuk@gmail.com>2015-10-12 21:39:48 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-17 21:55:26 -0700
commit63e781ad2442054b9d7b41a949c026ec7c16aafe (patch)
treeaabea57278257a935e700a26af6a34545856b272 /scripts/ver_linux
parent0fc8de5638e8668df65a4cbeb4ee3e4319b6eaec (diff)
downloadlinux-stable-63e781ad2442054b9d7b41a949c026ec7c16aafe.tar.gz
linux-stable-63e781ad2442054b9d7b41a949c026ec7c16aafe.tar.bz2
linux-stable-63e781ad2442054b9d7b41a949c026ec7c16aafe.zip
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>
Diffstat (limited to 'scripts/ver_linux')
-rwxr-xr-xscripts/ver_linux8
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/ver_linux b/scripts/ver_linux
index 7d85447d2ba5..65d4c0230712 100755
--- 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}'