diff --git a/ee/core/variables.py b/ee/core/variables.py index 07d76530..5f9198d1 100644 --- a/ee/core/variables.py +++ b/ee/core/variables.py @@ -121,11 +121,13 @@ class EEVariables(): elif ee_platform_codename == 'trusty': ee_php_repo = "ppa:ondrej/php" ee_php5_6 = ["php5.6-fpm", "php5.6-curl", "php5.6-gd", "php5.6-imap", - "php5.6-mcrypt", "php5.6-readline", "php5.6-common", - "php5.6-mysql", "php5.6-cli", "php5.6-zip", "php5.6-xml"] + "php5.6-mcrypt", "php5.6-readline", "php5.6-common", "php5.6-recode", + "php5.6-mysql", "php5.6-cli", "php5.6-curl", "php5.6-mbstring", + "php5.6-bcmath", "php5.6-mysql", "php5.6-opcache", "php5.6-zip", "php5.6-xml"] ee_php7_0 = ["php7.0-fpm", "php7.0-curl", "php7.0-gd", "php7.0-imap", - "php7.0-mcrypt", "php7.0-readline", "php7.0-common", - "php7.0-mysql", "php7.0-cli", "php7.0-zip", "php7.0-xml"] + "php7.0-mcrypt", "php7.0-readline", "php7.0-common", "php7.0-recode", + "php7.0-mysql", "php7.0-cli", "php7.0-curl", "php7.0-mbstring", + "php7.0-bcmath", "php7.0-mysql", "php7.0-opcache", "php7.0-zip", "php7.0-xml"] ee_php_extra = ["php-memcached", "php-imagick", "memcached", "graphviz", "php-pear", "php-xdebug", "php-msgpack"] elif ee_platform_distro == 'debian': diff --git a/install b/install index ce7f0c1e..ed027523 100644 --- a/install +++ b/install @@ -304,7 +304,7 @@ function ee_upgrade_php(){ add-apt-repository -y 'ppa:ondrej/php' ee_lib_echo "Upgrading required packages, please wait..." apt-get update &>> /dev/null - apt-get -y install php5.6-fpm php5.6-curl php5.6-gd php5.6-imap php5.6-mcrypt php5.6-readline php5.6-mysql php5.6-cli php5.6-common php-memcached php-imagick memcached graphviz php-pear php-xdebug php-msgpack php5.6-zip php5.6-xml || ee_lib_error "Unable to install PHP 5.6 packages, exit status " 1 + apt-get -y install php5.6-fpm php5.6-curl php5.6-gd php5.6-imap php5.6-mcrypt php5.6-readline php5.6-mysql php5.6-cli php5.6-common php5.6-curl php5.6-mbstring php5.6-bcmath php5.6-recode php5.6-mysql php5.6-opcache php-memcached php-imagick memcached graphviz php-pear php-xdebug php-msgpack php5.6-zip php5.6-xml || ee_lib_error "Unable to install PHP 5.6 packages, exit status " 1 if [ -e /etc/php5/fpm/pool.d/www.conf -a -e /etc/php5/fpm/pool.d/debug.conf -a -e /etc/php5/fpm/php.ini -a -e /etc/php5/fpm/php-fpm.conf ]; then cp -f /etc/php5/fpm/pool.d/www.conf /etc/php/5.6/fpm/pool.d/www.conf &>> /dev/null cp -f /etc/php5/fpm/pool.d/debug.conf /etc/php/5.6/fpm/pool.d/debug.conf &>> /dev/null @@ -325,10 +325,15 @@ function ee_upgrade_php(){ rm -f /etc/apt/sources.list.d/ondrej-php5-5_6-trusty.list &>> /dev/null apt-get remove -y php5-fpm php5-curl php5-gd php5-imap php5-mcrypt php5-common php5-readline php5-mysql php5-cli php5-memcache php5-imagick memcached graphviz php-pear + #Fix for PHP 5.6 + 7.0 missed packages elif [ -f /etc/apt/sources.list.d/ondrej-php-trusty.list ]; then - apt-get -y install php5.6-zip php5.6-xml || ee_lib_error "Unable to install PHP 5.6 packages, exit status " 1 + apt-get -y install php5.6-zip php5.6-xml php5.6-curl php5.6-mbstring php5.6-recode php5.6-bcmath php5.6-mysql php5.6-opcache || ee_lib_error "Unable to install PHP 5.6 packages, exit status " 1 + dpkg-query -W -f='${Status} ${Version}\n' php7.0-fpm 2>/dev/null | grep installed + if [ "$?" -eq "0" ]; then + apt-get -y install php7.0-zip php7.0-xml php7.0-curl php7.0-mbstring php7.0-recode php7.0-bcmath php7.0-mysql php7.0-opcache || ee_lib_error "Unable to install PHP 5.6 packages, exit status " 1 + fi fi - fi + fi }