From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752059AbbJLSks (ORCPT ); Mon, 12 Oct 2015 14:40:48 -0400 Received: from mail-lb0-f177.google.com ([209.85.217.177]:35256 "EHLO mail-lb0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751857AbbJLSkp (ORCPT ); Mon, 12 Oct 2015 14:40:45 -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 05/22] ver_linux: module-init-tools, look for numerical input, not field number Date: Mon, 12 Oct 2015 21:39:45 +0300 Message-Id: <1444675202-1375-5-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 28e7640..7cc74d1 100755 --- a/scripts/ver_linux +++ b/scripts/ver_linux @@ -39,7 +39,12 @@ awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{ printf("Util-linux\t\t%s\nMount\t\t\t%s\n",$0,$0) }' -depmod -V 2>&1 | awk 'NR==1 {print "module-init-tools ",$NF}' +depmod -V 2>&1 | +awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{ + match($0, /[0-9]+([.]?[0-9]+)+/) + printf("Module-init-tools\t%s\n", + substr($0,RSTART,RLENGTH)) +}' tune2fs 2>&1 | grep "^tune2fs" | sed 's/,//' | awk \ 'NR==1 {print "e2fsprogs ", $2}' -- 2.4.9