Make bootstrap.sh idempotent
Avoid screwing up the shell after bootstrap