diff options
author | Alexander Kapshuk <alexander.kapshuk@gmail.com> | 2015-10-12 14:39:52 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-18 00:55:26 -0400 |
commit | b903fa982db2832d7f402ff00cf30145e8a7fca0 (patch) | |
tree | d637e1cd3c5962c4ac7a2a80ef2f6fcbb273c08b | |
parent | 8fb0959822e16a91c23cb41e53693180a2b3389f (diff) |
ver_linux: ppp, 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'.
Tested on:
Oracle Linux
Signed-off-by: Alexander Kapshuk <alexander.kapshuk@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 d5b342eadca0..af5ac824e483 100755 --- a/scripts/ver_linux +++ b/scripts/ver_linux | |||
@@ -94,8 +94,12 @@ awk '/version/{ | |||
94 | substr($0,RSTART,RLENGTH)) | 94 | substr($0,RSTART,RLENGTH)) |
95 | }' | 95 | }' |
96 | 96 | ||
97 | pppd --version 2>&1| grep version | awk \ | 97 | pppd --version 2>&1 | |
98 | 'NR==1{print "PPP ", $3}' | 98 | awk '/version/{ |
99 | match($0, /[0-9]+([.]?[0-9]+)+/) | ||
100 | printf("PPP\t\t\t%s\n", | ||
101 | substr($0,RSTART,RLENGTH)) | ||
102 | }' | ||
99 | 103 | ||
100 | isdnctrl 2>&1 | grep version | awk \ | 104 | isdnctrl 2>&1 | grep version | awk \ |
101 | 'NR==1{print "isdn4k-utils ", $NF}' | 105 | 'NR==1{print "isdn4k-utils ", $NF}' |