From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752189AbcF1KWp (ORCPT ); Tue, 28 Jun 2016 06:22:45 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:36504 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752471AbcF1KUW (ORCPT ); Tue, 28 Jun 2016 06:20:22 -0400 From: Alexander Kapshuk To: linux-kernel@vger.kernel.org Cc: gregkh@linuxfoundation.org, Alexander Kapshuk Subject: [PATCH 25/32] ver_linux: wrap up call to 'loadkeys -V' in awk function Date: Tue, 28 Jun 2016 13:18:59 +0300 Message-Id: <1467109146-20331-25-git-send-email-alexander.kapshuk@gmail.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1467109146-20331-1-git-send-email-alexander.kapshuk@gmail.com> References: <1467109146-20331-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 Wrap up the call to 'loadkeys -V', the code to process its output, and the resulting formatted output in awk functions. Signed-off-by: Alexander Kapshuk --- scripts/ver_linux | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/scripts/ver_linux b/scripts/ver_linux index ac5a7f9..5eff838 100755 --- a/scripts/ver_linux +++ b/scripts/ver_linux @@ -54,13 +54,8 @@ BEGIN { printversion("Procps", version("ps --version 2>&1")) printversion("Net-tools", version("ifconfig --version 2>&1")) - -loadkeys -V 2>&1 | -awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{ - match($0, /[0-9]+([.]?[0-9]+)+/) - $0 = substr($0,RSTART,RLENGTH) - printf("Kbd\t\t\t%s\nConsole-tools\t\t%s\n",$0,$0) -}' + printversion("Kbd", version("loadkeys -V 2>&1")) + printversion("Console-tools", version("loadkeys -V 2>&1")) oprofiled --version 2>&1 | awk \ '(NR==1 && ($2 == "oprofile")) {print "oprofile ", $3}' -- 2.7.3