removing `-e` tests when cheking for `-f` or `-d`

adding local variable flag and setting the variable if java home isn't
taken care of in the first if check.

For some reason there were different tab widths for this bottom
section, unifying to what the top was at -- 2 spaces.