From 043e2123f4aa67bc3ea2d66e8ecdeb2a9808a61a Mon Sep 17 00:00:00 2001 From: Timothy Hofland Date: Fri, 13 Mar 2026 14:16:57 +0100 Subject: [PATCH] fix: move manual dependency installation outside of download block to ensure they are always verified --- scripts/setup.sh | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index d628173..6c32285 100644 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -219,24 +219,23 @@ if [ ! -d "openFrameworks" ]; then sudo -u "$REAL_USER" tar -xzf "$OF_FILE" sudo -u "$REAL_USER" mv of_v0.12.1_linux*_release openFrameworks sudo -u "$REAL_USER" rm "$OF_FILE" +fi - echo "Installing modern dependencies for Debian Trixie..." - if command -v apt-get > /dev/null; then - DEBIAN_FRONTEND=noninteractive apt-get install -y \ - libmpg123-dev libsndfile1-dev libopenal-dev libassimp-dev \ - libglew-dev libglfw3-dev liburiparser-dev \ - libcurl4-openssl-dev libpugixml-dev libasound2-dev \ - libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \ - gstreamer1.0-plugins-good gstreamer1.0-plugins-bad \ - gstreamer1.0-plugins-ugly gstreamer1.0-libav \ - libgtk-3-dev libboost-filesystem-dev \ - libfontconfig1-dev libfreetype-dev libx11-dev \ - libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev \ - libpulse-dev libudev-dev libfreeimage-dev librtaudio-dev \ - freeglut3-dev libxxf86vm-dev - fi -else - echo "OpenFrameworks already present. Skipping download." +# ALWAYS verify dependencies, even if OF is already present +echo "Ensuring modern dependencies for Debian Trixie..." +if command -v apt-get > /dev/null; then + DEBIAN_FRONTEND=noninteractive apt-get install -y \ + libmpg123-dev libsndfile1-dev libopenal-dev libassimp-dev \ + libglew-dev libglfw3-dev liburiparser-dev \ + libcurl4-openssl-dev libpugixml-dev libasound2-dev \ + libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \ + gstreamer1.0-plugins-good gstreamer1.0-plugins-bad \ + gstreamer1.0-plugins-ugly gstreamer1.0-libav \ + libgtk-3-dev libboost-filesystem-dev \ + libfontconfig1-dev libfreetype-dev libx11-dev \ + libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev \ + libpulse-dev libudev-dev libfreeimage-dev librtaudio-dev \ + freeglut3-dev libxxf86vm-dev fi echo "Downloading and building ofxPiMapper Addon..."