community-scripts/ProxmoxVE
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tools.func: Bugfix old gpg key for mysql & little improvements (#4916)

Browse Source
This commit is contained in:
CanbiZ 2025-06-02 11:41:25 +02:00 committed by GitHub
parent d97ce713ac
commit a307f9086b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
misc/tools.func
View File

@ -302,28 +302,34 @@ install_mysql() {
msg_info "MySQL $CURRENT_VERSION found, replacing with $MYSQL_VERSION" msg_info "MySQL $CURRENT_VERSION found, replacing with $MYSQL_VERSION"
NEED_INSTALL=true NEED_INSTALL=true
else else
msg_ok "MySQL $MYSQL_VERSION already installed" # Check for patch-level updates
if apt list --upgradable 2>/dev/null | grep -q '^mysql-server/'; then
msg_info "MySQL $CURRENT_VERSION available for upgrade"
$STD apt-get update
$STD apt-get install --only-upgrade -y mysql-server
msg_ok "MySQL upgraded"
fi
return
fi fi
else else
msg_info "MySQL not found, installing version $MYSQL_VERSION" msg_info "Installing MySQL $MYSQL_VERSION"
NEED_INSTALL=true NEED_INSTALL=true
fi fi
if [[ "$NEED_INSTALL" == true ]]; then if [[ "$NEED_INSTALL" == true ]]; then
msg_info "Removing conflicting MySQL packages"
$STD systemctl stop mysql >/dev/null 2>&1 || true $STD systemctl stop mysql >/dev/null 2>&1 || true
$STD apt-get purge -y 'mysql*' $STD apt-get purge -y "^mysql-server.*" "^mysql-client.*" "^mysql-common.*" || true
rm -f /etc/apt/sources.list.d/mysql.list /etc/apt/trusted.gpg.d/mysql.gpg rm -f /etc/apt/sources.list.d/mysql.list /etc/apt/trusted.gpg.d/mysql.gpg
msg_info "Setting up MySQL APT Repository" local DISTRO_CODENAME
DISTRO_CODENAME="$(awk -F= '/VERSION_CODENAME/ { print $2 }' /etc/os-release)" DISTRO_CODENAME="$(awk -F= '/VERSION_CODENAME/ { print $2 }' /etc/os-release)"
curl -fsSL https://repo.mysql.com/RPM-GPG-KEY-mysql-2022 | gpg --dearmor -o /etc/apt/trusted.gpg.d/mysql.gpg curl -fsSL https://repo.mysql.com/RPM-GPG-KEY-mysql-2023 | gpg --dearmor -o /etc/apt/trusted.gpg.d/mysql.gpg
echo "deb [signed-by=/etc/apt/trusted.gpg.d/mysql.gpg] https://repo.mysql.com/apt/debian/ ${DISTRO_CODENAME} mysql-${MYSQL_VERSION}" \ echo "deb [signed-by=/etc/apt/trusted.gpg.d/mysql.gpg] https://repo.mysql.com/apt/debian/ ${DISTRO_CODENAME} mysql-${MYSQL_VERSION}" \
>/etc/apt/sources.list.d/mysql.list >/etc/apt/sources.list.d/mysql.list
export DEBIAN_FRONTEND=noninteractive
$STD apt-get update $STD apt-get update
$STD apt-get install -y mysql-server $STD apt-get install -y mysql-server
msg_ok "Installed MySQL $MYSQL_VERSION" msg_ok "Installed MySQL $MYSQL_VERSION"
fi fi
} }