Various fixes to install tool shell-scripts.

Sorry about that last bogus request. Various fixes made that are pretty obvious from looking.