Merge branch 'hotfix/v3.5.1'

Author: iam404

CHANGELOG.txt

@@ -1,3 +1,6 @@
+v3.5.1 - Feb 25, 2016
+- Fixed #680
+
 v3.5.0 - Feb 24, 2016
 - Added PHP 7.0 support for Ubuntu(Trusty)
 - Dual support for PHP 5.6 + PHP 7.0

ee/core/variables.py

@@ -12,7 +12,7 @@ class EEVariables():
     """Intialization of core variables"""
 
     # EasyEngine version
-    ee_version = "3.5.0"
+    ee_version = "3.5.1"
 
 
     # EasyEngine packages versions
@@ -122,10 +122,10 @@ class EEVariables():
             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-mysql", "php5.6-cli", "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-mysql", "php7.0-cli", "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':

install

@@ -48,7 +48,7 @@ fi
 # Define variables for later use
 ee_branch=$1
 readonly ee_version_old="2.2.3"
-readonly ee_version_new="3.5.0"
+readonly ee_version_new="3.5.1"
 readonly ee_log_dir=/var/log/ee/
 readonly ee_install_log=/var/log/ee/install.log
 readonly ee_linux_distro=$(lsb_release -i | awk '{print $3}')
@@ -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 || 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 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
@@ -324,6 +324,9 @@ function ee_upgrade_php(){
             service php5.6-fpm restart &>> /dev/null
             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
+
+        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
         fi
     fi
 

setup.py

@@ -58,7 +58,7 @@
       shutil.copy2(os.path.expanduser("~")+'/.gitconfig', '/root/.gitconfig')
 
 setup(name='ee',
-      version='3.5.0',
+      version='3.5.1',
       description=long_description,
       long_description=long_description,
       classifiers=[],