boostrap: sync with upstream.

This version fixes some cosmetic and CLI inconsistencies, as
well as improving portability to BSDs.
* bootstrap: sync with upstream.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>