From 7891f65fb7544f3b1a126f8e0688889d6a6954f3 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Sun, 12 Jan 2020 12:53:59 +0100
Subject: Rev: 4589

---
 mayor-orig/mayor-installer-orig/install.d/05checkdeb.sh | 6 +++++-
 mayor-orig/mayor-installer-orig/log/mayor-installer.rev | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'mayor-orig/mayor-installer-orig')

diff --git a/mayor-orig/mayor-installer-orig/install.d/05checkdeb.sh b/mayor-orig/mayor-installer-orig/install.d/05checkdeb.sh
index 56c0e55d..07a2f6f3 100755
--- a/mayor-orig/mayor-installer-orig/install.d/05checkdeb.sh
+++ b/mayor-orig/mayor-installer-orig/install.d/05checkdeb.sh
@@ -40,9 +40,13 @@ then
     exit 255;
 fi
 
-if [[ "x${RELEASE}" =~ ^x9.* ]]
+if [[ "x${RELEASE}" =~ ^x9.* ]] 
 then
     PKGS="apache2 php php-json php-mysql php-ldap php-mbstring php-mcrypt php-curl mariadb-server-10.1 recode texlive texlive-fonts-extra texlive-latex-extra texlive-binaries texlive-xetex ntp wget ssl-cert ssh pwgen texlive-lang-european"
+elif [[ "x${RELEASE}" =~ ^x10.* ]]
+then
+    ## PHP 7.2-től php-mcrypt deprecated --> kivettük, de a kódban még van...
+    PKGS="apache2 php php-json php-mysql php-ldap php-mbstring php-curl php-bcmath mariadb-server-10.3 recode texlive texlive-fonts-extra texlive-latex-extra texlive-binaries texlive-xetex ntp wget ssl-cert ssh pwgen texlive-lang-european"
 else
     PKGS="apache2 php5 php5-json php5-mysqlnd php5-ldap php5-mcrypt php5-curl mysql-server recode texlive texlive-fonts-extra texlive-latex-extra texlive-binaries texlive-xetex ttf-mscorefonts-installer ntp wget ssl-cert ssh pwgen texlive-lang-european texlive-lang-hungarian"
 fi
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index 7b690e22..0da8daf7 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4574
+4589
-- 
cgit v1.2.3