From 5fe31b9531df1ee2f0b14881b126b33929eb5601 Mon Sep 17 00:00:00 2001 From: Zeljko Boros Date: Mon, 26 Apr 2021 14:33:38 +0200 Subject: [PATCH] modifikacije functions.sh za MariaDB 10.3 i PHP7.3 --- src/functions.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/functions.sh b/src/functions.sh index 9100f66..3825a4c 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -2,6 +2,9 @@ # Zoran 'jelly' Dzelajlija # Zeljko Boros +PHPVER="7.3" +MDB="10.3" + notice () { LC_MESSAGES=hr_HR dialog --backtitle "$title" --msgbox "$*" 18 75 } @@ -869,11 +872,12 @@ pkgupgrade () { fi } -# upgrade apache2/pthp5 +# upgrade apache2/php upgrade_apache2 () { - pkgrm apache-common # prevents installation of apache2-suexec - pkgupgrade libapache2-mod-php7.0 php7.0-cli php7.0-cn apache2-cn \ - php7.0-odbc mod-security-cn +### ne treba od etcha +### pkgrm apache-common # prevents installation of apache2-suexec + pkgupgrade libapache2-mod-php$PHPVER php$PHPVER-cli php$PHPVER-cn apache2-cn \ + php$PHPVER-odbc mod-security-cn } upgrade_amavis () { @@ -912,10 +916,10 @@ upgrade_amavis () { # handle mysql upgrade upgrade_mysql () { if pkg mysql-server || pkg mysql-server-5.5 || \ - pkg mariadb-server || pkg mariadb-server-10.0 + pkg mariadb-server || pkg mariadb-server-$MDB then pkgadd default-mysql-server - dpkg -P mysql-server mysql-server-5.5 mariadb-server-10.0 + dpkg -P mysql-server mysql-server-5.5 mariadb-server-$MDB service mysql restart fi } -- 1.7.10.4