summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Kapshuk <alexander.kapshuk@gmail.com>2015-10-12 21:39:51 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-18 07:55:26 +0300
commit8fb0959822e16a91c23cb41e53693180a2b3389f (patch)
tree071651c5842b38adf4524b636c66d1cddfc32733
parentf437d1ed68d3a51728c0ba3e7fb39a03df74fd1b (diff)
downloadlinux-8fb0959822e16a91c23cb41e53693180a2b3389f.tar.xz
ver_linux: quota-tools, 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>
-rwxr-xr-xscripts/ver_linux8
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/ver_linux b/scripts/ver_linux
index e36cceb45b0c..d5b342eadca0 100755
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -87,8 +87,12 @@ awk '/pcmciautils/{
cardmgr -V 2>&1| grep version | awk \
'NR==1{print "pcmcia-cs ", $3}'
-quota -V 2>&1 | grep version | awk \
-'NR==1{print "quota-tools ", $NF}'
+quota -V 2>&1 |
+awk '/version/{
+ match($0, /[0-9]+([.]?[0-9]+)+/)
+ printf("Quota-tools\t\t%s\n",
+ substr($0,RSTART,RLENGTH))
+}'
pppd --version 2>&1| grep version | awk \
'NR==1{print "PPP ", $3}'