diff --git a/lib/general b/lib/general index 1bf32dc..a88c1f0 100644 --- a/lib/general +++ b/lib/general @@ -4,8 +4,8 @@ # Prevent 'tput' errors when running from Cron [[ -z $TERM || $TERM == "unknown" || $TERM == "dumb" ]] && export TERM=dumb -readonly app_version="1.18.3" -readonly svr_version="1.10" +readonly app_version="1.18.4" +readonly svr_version="1.11" readonly os_ubuntu_supported=(focal jammy noble) # https://ubuntu.com/about/release-cycle readonly php_supported=(7.4 8.0 8.1 8.2 8.3) # https://www.php.net/supported-versions.php readonly php_default="8.3" diff --git a/lib/install b/lib/install index 8548ccf..db1106a 100644 --- a/lib/install +++ b/lib/install @@ -1094,11 +1094,11 @@ stack_builder() { # https://mariadb.org/download/?t=repo-config elif [[ $(lsb_release -c | cut -d':' -f 2 | xargs) =~ ^(bionic|focal)$ ]]; then sudo apt-key adv --fetch-keys 'https://mariadb.org/mariadb_release_signing_key.asc' - echo | sudo add-apt-repository "deb [arch=amd64,arm64,ppc64el] http://mirrors.syringanetworks.net/mariadb/repo/$(conf_read mysql-ver)/ubuntu $(check_osname) main" + echo | sudo add-apt-repository "deb [arch=amd64,arm64,ppc64el] https://deb.mariadb.org/$(conf_read mysql-ver)/ubuntu $(check_osname) main" else [[ -f /usr/share/keyrings/mariadb-archive-keyring.gpg && ( ! -s /usr/share/keyrings/mariadb-archive-keyring.gpg || -z $(cat -v /usr/share/keyrings/mariadb-archive-keyring.gpg | grep -m 1 '[^[:space:]]' )) ]] && sudo rm -rf /usr/share/keyrings/mariadb-archive-keyring.gpg # Prevent issues! [[ ! -f /usr/share/keyrings/mariadb-archive-keyring.gpg ]] && wget -nv -O- 'https://mariadb.org/mariadb_release_signing_key.asc' | sudo gpg --dearmor -o /usr/share/keyrings/mariadb-archive-keyring.gpg - echo "deb [signed-by=/usr/share/keyrings/mariadb-archive-keyring.gpg] http://mirrors.syringanetworks.net/mariadb/repo/$(conf_read mysql-ver)/ubuntu $(check_osname) main" | sudo tee /etc/apt/sources.list.d/mariadb.list + echo "deb [signed-by=/usr/share/keyrings/mariadb-archive-keyring.gpg] https://deb.mariadb.org/$(conf_read mysql-ver)/ubuntu $(check_osname) main" | sudo tee /etc/apt/sources.list.d/mariadb.list chmod 644 /usr/share/keyrings/mariadb-archive-keyring.gpg fi diff --git a/lib/update b/lib/update index 00c1814..d1977eb 100644 --- a/lib/update +++ b/lib/update @@ -386,7 +386,16 @@ onenine_to_oneten() { } -# Version numbers without point +# v1.18.4 +oneten_to_oneeleven() { + if [[ $(conf_read mysql) == "true" && -f /etc/apt/sources.list.d/mariadb.list ]]; then + sudo truncate -s 0 /etc/apt/sources.list.d/mariadb.list + echo "deb [signed-by=/usr/share/keyrings/mariadb-archive-keyring.gpg] https://deb.mariadb.org/$(conf_read mysql-ver)/ubuntu $(check_osname) main" | sudo tee /etc/apt/sources.list.d/mariadb.list + fi +} + + + [[ $(version $oldver) -lt $(version "1.1") ]] && onezero_to_oneone [[ $(version $oldver) -lt $(version "1.2") ]] && oneone_to_onetwo [[ $(version $oldver) -lt $(version "1.3") ]] && onetwo_to_onethree @@ -397,6 +406,7 @@ onenine_to_oneten() { [[ $(version $oldver) -lt $(version "1.8") ]] && oneseven_to_oneight [[ $(version $oldver) -lt $(version "1.9") ]] && oneight_to_onenine [[ $(version $oldver) -lt $(version "1.10") ]] && onenine_to_oneten +[[ $(version $oldver) -lt $(version "1.11") ]] && oneten_to_oneeleven # Update PIP packages!