Wrapper and version label fixes

I think the regular expression check I do on the directory name before removing it is only going to work with bash.  /bin/sh is basically calling bash, but this makes that explicit if the system changes to using something sh-compatible for /bin/sh.