diff options
| author |   Alexander Kapshuk <alexander.kapshuk@gmail.com> | 2015-10-12 21:40:01 +0300 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-17 21:55:26 -0700 |
| commit | 031c155a8c41edee6fad92dc4eee4c5fe2a06dea (patch) | |
| tree | e5716227a5b6e992cbb9107169c182cb1275b611 /scripts | |
| parent | ver_linux: use 'udevadm', instead of 'udevinfo' (diff) | |
| download | linux-dev-031c155a8c41edee6fad92dc4eee4c5fe2a06dea.tar.xz linux-dev-031c155a8c41edee6fad92dc4eee4c5fe2a06dea.zip | |
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>
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 f839be33bcb4..ae426c2e6f2a 100755 --- 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/ .*$//"` |