[PATCH 03/22] ver_linux: binutils, fix inaccurate output

Alexander Kapshuk
2015-10-12T18:40:43Z

Current implementation output on Gentoo Linux:
binutils 2.25.1
1.1
2.25.1

Proposed implementation:
Binutils 2.25.1

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

Rely on regex to find the version number.

Signed-off-by: Alexander Kapshuk <alexander.kapshuk@gmail.com>
---
scripts/ver_linux | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/ver_linux b/scripts/ver_linux
index 31c0e4d..1fea749 100755
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -25,7 +25,12 @@ awk '/GNU Make/{
substr($0,RSTART,RLENGTH))
}'

-echo "binutils $(ld -v | egrep -o '[0-9]+\.[0-9\.]+')"
+ld -v 2>&1 |
+awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
+ match($0, /[0-9]+([.]?[0-9]+)+/)
+ printf("Binutils\t\t%s\n",
+ substr($0,RSTART,RLENGTH))
+}'

echo -n "util-linux "
fdformat --version | awk '{print $NF}' | sed -e s/^util-linux-// -e s/\)$//
--
2.4.9