ver_linux: wireless-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.

Tested on:
Gentoo Linux

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 f839be33bcb4a12ee8fec37a1a1b19e9222b5e1d..ae426c2e6f2a15bcb170dc6491f1aa8a156a3e99 100755 (executable)
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -171,8 +171,12 @@ awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
        substr($0,RSTART,RLENGTH))
 }'
 
-iwconfig --version 2>&1 | awk \
-'(NR==1 && ($3 == "version")) {print "wireless-tools        ",$4}'
+iwconfig --version 2>&1 |
+awk '/version/{
+       match($0, /[0-9]+([.]?[0-9]+)+/)
+       printf("Wireless-tools\t\t%s\n",
+       substr($0,RSTART,RLENGTH))
+}'
 
 if [ -e /proc/modules ]; then
     X=`cat /proc/modules | sed -e "s/ .*$//"`