summaryrefslogtreecommitdiffstats
path: root/scripts/ver_linux
diff options
context:
space:
mode:
authorAlexander Kapshuk <alexander.kapshuk@gmail.com>2015-10-12 21:39:49 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-17 21:55:26 -0700
commit44422f3cd9d2d28049b8eb544ebbc845fd419eef (patch)
treedb818badef49486eec86e51849e050f11ed0d965 /scripts/ver_linux
parent63e781ad2442054b9d7b41a949c026ec7c16aafe (diff)
downloadlinux-44422f3cd9d2d28049b8eb544ebbc845fd419eef.tar.gz
linux-44422f3cd9d2d28049b8eb544ebbc845fd419eef.tar.bz2
linux-44422f3cd9d2d28049b8eb544ebbc845fd419eef.zip
ver_linux: xfsprogs, 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 65d4c0230712..a926225e10af 100755
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -70,8 +70,12 @@ awk '/^reiserfsck/{
fsck.reiser4 -V 2>&1 | grep ^fsck.reiser4 | awk \
'NR==1{print "reiser4progs ", $2}'
-xfs_db -V 2>&1 | grep version | awk \
-'NR==1{print "xfsprogs ", $3}'
+xfs_db -V 2>&1 |
+awk '/version/{
+ match($0, /[0-9]+([.]?[0-9]+)+/)
+ printf("Xfsprogs\t\t%s\n",
+ substr($0,RSTART,RLENGTH))
+}'
pccardctl -V 2>&1| grep pcmciautils | awk '{print "pcmciautils ", $2}'