From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752525AbbJLSnG (ORCPT ); Mon, 12 Oct 2015 14:43:06 -0400 Received: from mail-lb0-f196.google.com ([209.85.217.196]:36677 "EHLO mail-lb0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932102AbbJLSlJ (ORCPT ); Mon, 12 Oct 2015 14:41:09 -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 19/22] ver_linux: sh-utils, look for numerical input, not field number Date: Mon, 12 Oct 2015 21:39:59 +0300 Message-Id: <1444675202-1375-19-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. Tested on: Gentoo Linux Debian 6.0.10 Oracle Linux Server release 7.1 Signed-off-by: Alexander Kapshuk --- scripts/ver_linux | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/ver_linux b/scripts/ver_linux index e6b57d5..1c6ec22 100755 --- a/scripts/ver_linux +++ b/scripts/ver_linux @@ -157,7 +157,12 @@ awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{ oprofiled --version 2>&1 | awk \ '(NR==1 && ($2 == "oprofile")) {print "oprofile ", $3}' -expr --v 2>&1 | awk 'NR==1{print "Sh-utils ", $NF}' +expr --v 2>&1 | +awk '/^expr/{ + match($0, /[0-9]+([.]?[0-9]+)+/) + printf("Sh-utils\t\t%s\n", + substr($0,RSTART,RLENGTH)) +}' udevinfo -V 2>&1 | grep version | awk '{print "udev ", $3}' -- 2.4.9