From 2052e1386bdcd0fbae794dd6e7c4625a843a749b Mon Sep 17 00:00:00 2001
From: Bart van Oort <bart@vanoort.is>
Date: Sun, 14 Jan 2024 02:06:00 +0100
Subject: [PATCH] Make DietPi's software tools available during CI build

---
 .github/workflows/main.yml |  1 +
 dietpi/build.sh            | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c05c955..23a5489 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,6 +23,7 @@ jobs:
         with:
           base_image: dietpi:rpi_armv8_bullseye
           cpu: cortex-a53
+          image_additional_mb: 500
           commands: |
             set +x
             echo
diff --git a/dietpi/build.sh b/dietpi/build.sh
index 0650d2a..6e5b1e8 100755
--- a/dietpi/build.sh
+++ b/dietpi/build.sh
@@ -2,12 +2,21 @@
 # This script is meant to be run inside a DietPi image and expects to be within this Git repository (as it will look for certain files there)
 # It installs the necessary packages and configs on top of DietPi to create the OS image for Pi-DJ.
 # TODO: figure out how I can experiment with the resulting images without having to flash them onto an actual Pi.
+# Maybe with this? https://unix.stackexchange.com/questions/716226/emulating-arm-v8-to-run-dietpi-in-qemu-for-userspace-software
 
 HERE="$(dirname "$(realpath "$0")")"
 REPO_DIR=$(realpath "$HERE/..")
 
+# Add /boot/dietpi to PATH so we can use the dietpi-* commands
+PATH="$PATH:/boot/dietpi"
 source "$HERE/utils.sh"
 
+echo "DEBUGGING!!!!"
+ping -4nc 1 -W 10 9.9.9.9 || echo "Can't ping the internet!!!"
+echo "DEBUGGING!!!!"
+
+#--------------------------------------------------------------------------------------------------
+
 ## Create pi-dj user and delete default dietpi user
 default_username=pi-dj
 default_password=pidj
@@ -56,6 +65,7 @@ set_dietpi_config SOFTWARE_DISABLE_SSH_PASSWORD_LOGINS root # Disable SSH passwo
 #
 #
 
+
 ## Install all packages needed for a usable desktop environment
 # 5: Alsa
 # 6: X.Org
@@ -65,11 +75,12 @@ set_dietpi_config SOFTWARE_DISABLE_SSH_PASSWORD_LOGINS root # Disable SSH passwo
 # 188: Go 
 # 67: Firefox
 dietpi-software install 5 6 7 170 17 188 67
+
 # install i3 and dependencies
-apt install -y i3 polybar onboard fonts-roboto fonts-font-awesome dunst rofi
+apt-get install -y i3 polybar onboard fonts-roboto fonts-font-awesome dunst rofi
 
 # install some useful CLI tools for maintenance
-apt install -y kitty zsh man less
+apt-get install -y kitty zsh man less
 sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
 chsh -s "$(which zsh)"
 git config pull.rebase true