From 4ac0db3dc2994e6c198aea913e956530d38699d6 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Tue, 21 Oct 2025 09:46:00 +0200 Subject: [PATCH] Update Node.js version and improve MySQL setup for Debian Bumps Node.js version from 22 to 24 in ente-install.sh. Enhances MySQL setup in tools.func to explicitly block installation on Debian Trixie/forky/sid due to incompatibility, providing alternative solutions and clearer messaging. --- install/ente-install.sh | 2 +- misc/tools.func | 26 +++++++++++++++----------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/install/ente-install.sh b/install/ente-install.sh index b08386d4..8a4b06ab 100644 --- a/install/ente-install.sh +++ b/install/ente-install.sh @@ -24,7 +24,7 @@ msg_ok "Installed Dependencies" PG_VERSION="17" setup_postgresql setup_go -NODE_VERSION="22" NODE_MODULE="yarn" setup_nodejs +NODE_VERSION="24" NODE_MODULE="yarn" setup_nodejs fetch_and_deploy_gh_release "ente" "ente-io/ente" "tarball" "latest" "/opt/ente" msg_info "Setting up PostgreSQL" diff --git a/misc/tools.func b/misc/tools.func index acc99ef8..59983a90 100644 --- a/misc/tools.func +++ b/misc/tools.func @@ -2311,22 +2311,26 @@ function setup_mysql() { # Cleanup old repository files cleanup_old_repo_files "mysql" + # MySQL compatibility check for Debian Trixie + if [[ "$DISTRO_ID" == "debian" && "$DISTRO_CODENAME" =~ ^(trixie|forky|sid)$ ]]; then + msg_error "MySQL is not compatible with Debian testing/unstable (${DISTRO_CODENAME})" + msg_info "Reason: MySQL packages depend on libaio1, but Debian Trixie uses libaio1t64" + msg_info "" + msg_info "Alternative solutions:" + msg_info " 1. Use MariaDB instead: MARIADB_VERSION=\"11.4\" setup_mariadb" + msg_info " 2. Wait for Oracle to update MySQL packages for Debian 13" + msg_info " 3. Use Debian 12 (Bookworm) which is officially supported" + return 1 + fi + # MySQL doesn't support Debian testing/unstable - try bookworm as fallback local SUITE case "$DISTRO_CODENAME" in - trixie | forky | sid) - # MySQL doesn't publish packages for Debian testing/unstable - # Try bookworm as fallback - if verify_repo_available "https://repo.mysql.com/apt/${DISTRO_ID}" "bookworm"; then - SUITE="bookworm" - msg_warn "MySQL ${MYSQL_VERSION} not available for ${DISTRO_CODENAME}, using bookworm packages" - else - msg_error "MySQL ${MYSQL_VERSION} package not available for ${DISTRO_ID}-${DISTRO_CODENAME}" - msg_info "MySQL typically doesn't support Debian testing/unstable. Consider using MariaDB instead." - return 1 - fi + bookworm | bullseye) + SUITE="$DISTRO_CODENAME" ;; *) + # For Ubuntu SUITE=$(get_fallback_suite "$DISTRO_ID" "$DISTRO_CODENAME" "https://repo.mysql.com/apt/${DISTRO_ID}") ;; esac