From 4a0111d54c22ae7a12a43248ebc630184696170e Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
Date: Mon, 21 Mar 2022 02:43:09 +0000
Subject: [PATCH] apt: also dist-upgrade etc

---
 src/run.sh                            | 35 +++++++++++++++++++++------
 src/steps-preinstall/10-apt-update.sh |  3 ---
 src/steps-preinstall/10-apt.sh        | 17 +++++++++++++
 3 files changed, 45 insertions(+), 10 deletions(-)
 delete mode 100755 src/steps-preinstall/10-apt-update.sh
 create mode 100755 src/steps-preinstall/10-apt.sh

diff --git a/src/run.sh b/src/run.sh
index 8f9a709..02cef61 100755
--- a/src/run.sh
+++ b/src/run.sh
@@ -161,9 +161,15 @@ stage_end "$?";
 
 ###############################################################################
 
-###
+
+# ███████ ████████ ███████ ██████      ██████
+# ██         ██    ██      ██   ██          ██
+# ███████    ██    █████   ██████       █████
+#      ██    ██    ██      ██          ██
+# ███████    ██    ███████ ██          ███████
+
 # Pre-install tasks
-###
+#######################################
 
 stage_begin "Executing pre-install tasks";
 while read -r preinstall_step; do
@@ -174,9 +180,15 @@ stage_end "$?" "1 or more pre-install tasks failed";
 
 ###############################################################################
 
-###
+
+# ███████ ████████ ███████ ██████      ██████
+# ██         ██    ██      ██   ██          ██
+# ███████    ██    █████   ██████       █████
+#      ██    ██    ██      ██               ██
+# ███████    ██    ███████ ██          ██████
+
 # Install packages
-###
+#######################################
 
 stage_begin "Installing apt packages";
 apt-get install --no-install-recommends --yes "$(cat "${temp_dir}/apt-packages.txt")";
@@ -184,9 +196,15 @@ stage_end "$?" "Failed to install apt packages";
 
 ###############################################################################
 
-###
+
+# ███████ ████████ ███████ ██████      ██   ██
+# ██         ██    ██      ██   ██     ██   ██
+# ███████    ██    █████   ██████      ███████
+#      ██    ██    ██      ██               ██
+# ███████    ██    ███████ ██               ██
+
 # Post-install tasks
-###
+#######################################
 
 stage_begin "Running post-install tasks";
 while read -r postinstall_step; do
@@ -217,5 +235,8 @@ echo "
 ██      ██    ██ ██  ██  ██ ██      ██      ██         ██    ██
  ██████  ██████  ██      ██ ██      ███████ ███████    ██    ███████ ██
 
-$(cat /etc/hostname) is now ready for use! Please reboot me to ensure everything is working as intended.
+$(cat /etc/hostname) is now ready for use! Here's a quick checklist:
+
+ • Ensure a static IP is configured on the router if required
+ • Reboot me to ensure everything is working as intended
 " | "${rainbow}";
diff --git a/src/steps-preinstall/10-apt-update.sh b/src/steps-preinstall/10-apt-update.sh
deleted file mode 100755
index 31d70c1..0000000
--- a/src/steps-preinstall/10-apt-update.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-apt-get update;
diff --git a/src/steps-preinstall/10-apt.sh b/src/steps-preinstall/10-apt.sh
new file mode 100755
index 0000000..73ecf2f
--- /dev/null
+++ b/src/steps-preinstall/10-apt.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+task_begin "apt update";
+apt-get update;
+task_end "$?";
+
+task_begin "apt upgrade";
+apt-get dist-upgrade -y;
+task_end "$?";
+
+task_begin "apt autoremove";
+apt-get autoremove -y;
+task_end "$?";
+
+task_begin "apt autoclean";
+apt-get autoclean -y;
+task_end "$?";