From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752114AbbJLSkl (ORCPT ); Mon, 12 Oct 2015 14:40:41 -0400 Received: from mail-lb0-f194.google.com ([209.85.217.194]:34881 "EHLO mail-lb0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752059AbbJLSkj (ORCPT ); Mon, 12 Oct 2015 14:40:39 -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 02/22] ver_linux: make --version, use regex to find version number Date: Mon, 12 Oct 2015 21:39:42 +0300 Message-Id: <1444675202-1375-2-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 a field number. Reduce the number of 'awk' invocations from two to one. 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 af6467e..31c0e4d 100755 --- a/scripts/ver_linux +++ b/scripts/ver_linux @@ -18,8 +18,12 @@ awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{ substr($0,RSTART,RLENGTH)) }' -make --version 2>&1 | awk -F, '{print $1}' | awk \ - '/GNU Make/{print "Gnu make ",$NF}' +make --version 2>&1 | +awk '/GNU Make/{ + match($0, /[0-9]+([.]?[0-9]+)+/) + printf("GNU Make\t\t%s\n", + substr($0,RSTART,RLENGTH)) +}' echo "binutils $(ld -v | egrep -o '[0-9]+\.[0-9\.]+')" -- 2.4.9