Separate more commands so single.sh can build them standalone.
2 files changed