From 8fb0959822e16a91c23cb41e53693180a2b3389f Mon Sep 17 00:00:00 2001 From: Alexander Kapshuk Date: Mon, 12 Oct 2015 21:39:51 +0300 Subject: 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 Signed-off-by: Greg Kroah-Hartman --- scripts/ver_linux | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'scripts/ver_linux') 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}' -- cgit