Minor cleanup for `bootstrap-common.sh` and `bootstrap-packages`
What does this merge request do and why?
Reorganizes shell code a bit for readability. Saves some time on jumping and guessing.
Merge request checklist
-
This change is backward compatible. If not, please include steps to communicate to our users. -
Tests added for new functionality. If not, please raise an issue to follow-up. -
Documentation added/updated, if needed. -
gdk doctortest added, if needed. -
Add the ~highlightlabel if this MR should be included in theCHANGELOG.md.