diff --git a/scripts/setup/machine-setup/machine-setup.sh b/scripts/setup/machine-setup/machine-setup.sh index 7bb4efff..6f07fb36 100755 --- a/scripts/setup/machine-setup/machine-setup.sh +++ b/scripts/setup/machine-setup/machine-setup.sh @@ -383,25 +383,7 @@ if ! skip; then fi # ============================================================================= -# 6. Command-line tools -# ============================================================================= -# -# A different thing from core utils, and kept apart from them: upstream binaries -# fetched from upstream, on their own release cadence, none of which the -# distribution ships. Lumping them in made a run look like it was installing -# system packages and then start pulling tarballs unannounced. - -step "Command-line tools" -if ! skip; then - # shellcheck disable=SC2046 # word splitting is how the list is passed - tools_install "Command-line tools" $(tools_default) - summarise_last "Command-line tools" - step_ok -fi - - -# ============================================================================= -# 7. Tailscale +# 6. Tailscale # ============================================================================= # # Placed here, before everything that can go wrong, because it is a second way @@ -630,6 +612,24 @@ if ! skip; then step_ok fi +# ============================================================================= +# 7. Command-line tools +# ============================================================================= +# +# A different thing from core utils, and kept apart from them: upstream binaries +# fetched from upstream, on their own release cadence, none of which the +# distribution ships. Lumping them in made a run look like it was installing +# system packages and then start pulling tarballs unannounced. + +step "Command-line tools" +if ! skip; then + # shellcheck disable=SC2046 # word splitting is how the list is passed + tools_install "Command-line tools" $(tools_default) + summarise_last "Command-line tools" + step_ok +fi + + # ============================================================================= # 8. Locale # =============================================================================