diff options
| author | Alexander Kapshuk <alexander.kapshuk@gmail.com> | 2015-10-12 21:39:50 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-17 21:55:26 -0700 |
| commit | f437d1ed68d3a51728c0ba3e7fb39a03df74fd1b (patch) | |
| tree | 89e526cbc468cb5692f42b10af97eac3e850129e /scripts | |
| parent | 44422f3cd9d2d28049b8eb544ebbc845fd419eef (diff) | |
| download | linux-stable-f437d1ed68d3a51728c0ba3e7fb39a03df74fd1b.tar.gz linux-stable-f437d1ed68d3a51728c0ba3e7fb39a03df74fd1b.tar.bz2 linux-stable-f437d1ed68d3a51728c0ba3e7fb39a03df74fd1b.zip | |
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>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/ver_linux | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/ver_linux b/scripts/ver_linux index a926225e10af..e36cceb45b0c 100755 --- 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}' |