Pārlūkot izejas kodu

ver_linux: make --version, use regex to find version number

Rely on regex to find the version number, rather than a field number.
Reduce the number of 'awk' invocations from two to one.

Signed-off-by: Alexander Kapshuk <alexander.kapshuk@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Alexander Kapshuk 9 gadi atpakaļ
vecāks
revīzija
1d60b873ae
1 mainītis faili ar 6 papildinājumiem un 2 dzēšanām
  1. 6 2
      scripts/ver_linux

+ 6 - 2
scripts/ver_linux

@@ -18,8 +18,12 @@ awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
 	substr($0,RSTART,RLENGTH))
 	substr($0,RSTART,RLENGTH))
 }'
 }'
 
 
-make --version 2>&1 | awk -F, '{print $1}' | awk \
-      '/GNU Make/{print "Gnu make              ",$NF}'
+make --version 2>&1 |
+awk '/GNU Make/{
+	match($0, /[0-9]+([.]?[0-9]+)+/)
+	printf("GNU Make\t\t%s\n",
+	substr($0,RSTART,RLENGTH))
+}'
 
 
 echo "binutils               $(ld -v | egrep -o '[0-9]+\.[0-9\.]+')"
 echo "binutils               $(ld -v | egrep -o '[0-9]+\.[0-9\.]+')"