diff options
author | Alexander Kapshuk <alexander.kapshuk@gmail.com> | 2015-10-12 14:39:51 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-18 00:55:26 -0400 |
commit | 8fb0959822e16a91c23cb41e53693180a2b3389f (patch) | |
tree | 071651c5842b38adf4524b636c66d1cddfc32733 /scripts | |
parent | f437d1ed68d3a51728c0ba3e7fb39a03df74fd1b (diff) |
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>
Diffstat (limited to 'scripts')
-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 e36cceb45b0c..d5b342eadca0 100755 --- a/scripts/ver_linux +++ b/scripts/ver_linux | |||
@@ -87,8 +87,12 @@ awk '/pcmciautils/{ | |||
87 | cardmgr -V 2>&1| grep version | awk \ | 87 | cardmgr -V 2>&1| grep version | awk \ |
88 | 'NR==1{print "pcmcia-cs ", $3}' | 88 | 'NR==1{print "pcmcia-cs ", $3}' |
89 | 89 | ||
90 | quota -V 2>&1 | grep version | awk \ | 90 | quota -V 2>&1 | |
91 | 'NR==1{print "quota-tools ", $NF}' | 91 | awk '/version/{ |
92 | match($0, /[0-9]+([.]?[0-9]+)+/) | ||
93 | printf("Quota-tools\t\t%s\n", | ||
94 | substr($0,RSTART,RLENGTH)) | ||
95 | }' | ||
92 | 96 | ||
93 | pppd --version 2>&1| grep version | awk \ | 97 | pppd --version 2>&1| grep version | awk \ |
94 | 'NR==1{print "PPP ", $3}' | 98 | 'NR==1{print "PPP ", $3}' |