openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Alexander Kapshuk 2015-10-12 21:39:51 +03:00 committed by Greg Kroah-Hartman
parent f437d1ed68
commit 8fb0959822
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/ver_linux
View File

@ -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}'