scripts/addToolsVersion: versions can be either in the .in or the .in.2

The components have their version selection handled either in the .in
file or the .in.2 file. Handle both cases.

Also, when dumping an existing version, keep the user's grep options
(ie. do override neither options nor colors).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

diff -dur ELFkickers.orig/sstrip/Makefile ELFkickers/sstrip/Makefile

--- ELFkickers.orig/sstrip/Makefile	2001-03-24 12:58:27.000000000 +0100

+++ ELFkickers/sstrip/Makefile	2007-05-31 21:17:18.000000000 +0200

@@ -1,7 +1,7 @@

 #  Makefile for sstrip

 sstrip: sstrip.c

-	gcc -ggdb -Wall -W -o sstrip sstrip.c

+	$(CC) -Wall -W -o sstrip sstrip.c

 clean:

 	rm -f sstrip