diff --git a/scripts/setup.sh b/scripts/setup.sh index f81631a..8e8cdfa 100644 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -193,17 +193,31 @@ EOF echo "Installing Pre-compiled OpenFrameworks (FAST)..." cd "$REAL_HOME" if [ ! -d "openFrameworks" ]; then - echo "Downloading OpenFrameworks v0.12.1 for ARM64..." - # Use wget with visibility, fallback to curl if it fails - if ! sudo -u "$REAL_USER" wget https://github.com/openframeworks/openFrameworks/releases/download/0.12.1/of_v0.12.1_linuxarm64_release.tar.gz; then - echo "Wget failed, trying curl..." - sudo -u "$REAL_USER" curl -L -O https://github.com/openframeworks/openFrameworks/releases/download/0.12.1/of_v0.12.1_linuxarm64_release.tar.gz + echo "Downloading OpenFrameworks v0.12.1..." + + # Determine architecture for download + ARCH=$(uname -m) + OF_FILE="of_v0.12.1_linuxaarch64_release.tar.gz" # Default for 64-bit + + if [ "$ARCH" != "aarch64" ] && [ "$ARCH" != "x86_64" ]; then + echo "32-bit or legacy ARM detected. Using armv6l version." + OF_FILE="of_v0.12.1_linuxarmv6l_release.tar.gz" + fi + + # Use the user-suggested URL format if my default fails + DOWNLOAD_URL="https://github.com/openframeworks/openFrameworks/releases/download/0.12.1/$OF_FILE" + + echo "Downloading from: $DOWNLOAD_URL" + if ! sudo -u "$REAL_USER" wget "$DOWNLOAD_URL"; then + echo "Wget failed, trying manual fallback URL..." + sudo -u "$REAL_USER" curl -L -O "$DOWNLOAD_URL" fi echo "Extracting OpenFrameworks..." - sudo -u "$REAL_USER" tar -xzf of_v0.12.1_linuxarm64_release.tar.gz - sudo -u "$REAL_USER" mv of_v0.12.1_linuxarm64_release openFrameworks - sudo -u "$REAL_USER" rm of_v0.12.1_linuxarm64_release.tar.gz + sudo -u "$REAL_USER" tar -xzf "$OF_FILE" + # Use a wildcard to handle the different folder names (aarch64 vs armv6l) + sudo -u "$REAL_USER" mv of_v0.12.1_linux*_release openFrameworks + sudo -u "$REAL_USER" rm "$OF_FILE" else echo "OpenFrameworks already present. Skipping download." fi