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>

 # Compute AVR32-specific values

 CT_DoArchTupleValues() {

     # The architecture part of the tuple:

     CT_TARGET_ARCH="${CT_ARCH}"

     # gcc ./configure flags

     CT_ARCH_WITH_ARCH=

     CT_ARCH_WITH_ABI=

     CT_ARCH_WITH_CPU=

     CT_ARCH_WITH_TUNE=

     CT_ARCH_WITH_FPU=

     CT_ARCH_WITH_FLOAT=

     CT_TARGET_SYS=none

 }