From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752499AbbJLSpk (ORCPT ); Mon, 12 Oct 2015 14:45:40 -0400 Received: from mail-lb0-f193.google.com ([209.85.217.193]:36643 "EHLO mail-lb0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752330AbbJLSk4 (ORCPT ); Mon, 12 Oct 2015 14:40:56 -0400 From: Alexander Kapshuk To: linux-kernel@vger.kernel.org Cc: gregkh@linuxfoundation.org, jim.epost@gmail.com, richard@nod.at, tytso@mit.edu, Alexander Kapshuk Subject: [PATCH 12/22] ver_linux: ppp, look for numerical input, not field number Date: Mon, 12 Oct 2015 21:39:52 +0300 Message-Id: <1444675202-1375-12-git-send-email-alexander.kapshuk@gmail.com> X-Mailer: git-send-email 2.4.9 In-Reply-To: <1444675202-1375-1-git-send-email-alexander.kapshuk@gmail.com> References: <1444675202-1375-1-git-send-email-alexander.kapshuk@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- scripts/ver_linux | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/ver_linux b/scripts/ver_linux index d5b342e..af5ac82 100755 --- a/scripts/ver_linux +++ b/scripts/ver_linux @@ -94,8 +94,12 @@ awk '/version/{ substr($0,RSTART,RLENGTH)) }' -pppd --version 2>&1| grep version | awk \ -'NR==1{print "PPP ", $3}' +pppd --version 2>&1 | +awk '/version/{ + match($0, /[0-9]+([.]?[0-9]+)+/) + printf("PPP\t\t\t%s\n", + substr($0,RSTART,RLENGTH)) +}' isdnctrl 2>&1 | grep version | awk \ 'NR==1{print "isdn4k-utils ", $NF}' -- 2.4.9