From be6bb51a9f6a60995e0069bfdd9e0611d78ae4c6 Mon Sep 17 00:00:00 2001 From: Alexander Kapshuk Date: Mon, 12 Oct 2015 21:39:57 +0300 Subject: ver_linux: net-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. Proposed implementation also eliminates the necessity to invoke 'grep' + 'awk'. Signed-off-by: Alexander Kapshuk Signed-off-by: Greg Kroah-Hartman --- scripts/ver_linux | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/ver_linux b/scripts/ver_linux index 2269803dddb5..4ef1b7d370a9 100755 --- a/scripts/ver_linux +++ b/scripts/ver_linux @@ -140,8 +140,12 @@ awk '/version/{ substr($0,RSTART,RLENGTH)) }' -ifconfig --version 2>&1 | grep tools | awk \ -'NR==1{print "Net-tools ", $NF}' +ifconfig --version 2>&1 | +awk '/tools/{ + match($0, /[0-9]+([.]?[0-9]+)+/) + printf("Net-tools\t\t%s\n", + substr($0,RSTART,RLENGTH)) +}' # Kbd needs 'loadkeys -h', loadkeys -h 2>&1 | awk \ -- cgit v1.2.3-58-ga151