Added support for pathnames with spaces in bootstrap.