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 s390-specific values

CT_DoArchTupleValues() {

    # That's the only thing to override

    if [ "${CT_ARCH_64}" = "y" ]; then

        CT_TARGET_ARCH="s390x"

    fi

}