Replace the execution of greps followed by testing the return code by
directly executing the greps in the "if" context, because otherwise the
-e option set at the beginning of the script makes the "else" branch
exit.
Merge pull request #19 from fpavageau/32_or_64_bit

Allow adding a 32-bit JDK, as well as a non-Oracle one
Clonse #16