ver_linux: pcmciautils, 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>

diff --git a/scripts/ver_linux b/scripts/ver_linux
index a926225e10afdb30ae0c24599456ee25416eb9a2..e36cceb45b0c459f554ef185ac2e46e5aacae3cb 100755 (executable)
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -77,7 +77,12 @@ awk '/version/{
        substr($0,RSTART,RLENGTH))
 }'
 
-pccardctl -V 2>&1| grep pcmciautils | awk '{print "pcmciautils           ", $2}'
+pccardctl -V 2>&1 |
+awk '/pcmciautils/{
+       match($0, /[0-9]+([.]?[0-9]+)+/)
+       printf("Pcmciautils\t\t%s\n",
+       substr($0,RSTART,RLENGTH))
+}'
 
 cardmgr -V 2>&1| grep version | awk \
 'NR==1{print "pcmcia-cs             ", $3}'