From: Alexander Kapshuk <alexander.kapshuk@gmail.com>
Date: Mon, 12 Oct 2015 18:39:46 +0000 (+0300)
Subject: ver_linux: e2fsprogs, look for numerical input, not field number
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a8782227598084d95358c08a6d3d6ea84422af11;p=linux-beck.git

ver_linux: e2fsprogs, look for numerical input, not field number

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' + 'sed' + 'awk'.

Tested on:
Gentoo Linux
Debian 6.0.10
Oracle Linux Server release 7.1

Signed-off-by: Alexander Kapshuk <alexander.kapshuk@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/scripts/ver_linux b/scripts/ver_linux
index 7cc74d15e7f1..2e1929f2c9de 100755
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -46,8 +46,12 @@ awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
 	substr($0,RSTART,RLENGTH))
 }'
 
-tune2fs 2>&1 | grep "^tune2fs" | sed 's/,//' |  awk \
-'NR==1 {print "e2fsprogs             ", $2}'
+tune2fs 2>&1 |
+awk '/^tune2fs/{
+	match($0, /[0-9]+([.]?[0-9]+)+/)
+	printf("E2fsprogs\t\t%s\n",
+	substr($0,RSTART,RLENGTH))
+}'
 
 fsck.jfs -V 2>&1 | grep version | sed 's/,//' |  awk \
 'NR==1 {print "jfsutils              ", $3}'