diff --git a/CHANGELOG.txt b/CHANGELOG.txt index ecde7bca..c29d5aba 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,6 @@ +v3.3.15 - Dec 9, 2015 +- Upgrade wp-cli version to 0.21.1 + v 3.3.14 - Nov 10, 2015 - Fix EasyEngine installation issue diff --git a/ee/core/variables.py b/ee/core/variables.py index b1e97fcd..5cb73187 100644 --- a/ee/core/variables.py +++ b/ee/core/variables.py @@ -12,11 +12,11 @@ class EEVariables(): """Intialization of core variables""" # EasyEngine version - ee_version = "3.3.14" + ee_version = "3.3.15" # EasyEngine packages versions - ee_wp_cli = "0.21.0" + ee_wp_cli = "0.21.1" ee_adminer = "4.2.1" ee_roundcube = "1.1.3" ee_vimbadmin = "3.0.12" diff --git a/install b/install index 82889ecd..d682967e 100644 --- a/install +++ b/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.3.14" +readonly ee_version_new="3.3.15" 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}') @@ -216,12 +216,30 @@ function ee_sync_db() fi } + function secure_ee_db() { chown -R root:root /var/lib/ee/ chmod -R 600 /var/lib/ee/ } +function ee_update_wp_cli() +{ + ee_lib_echo "Updating WP-CLI version to resolve compatibility issue." + PHP_PATH=$(which php) + WP_CLI_PATH=$(which wp) + if [ "${WP_CLI_PATH}" != "" ]; then + # Get WP-CLI version + WP_CLI_VERSION=$(${PHP_PATH} ${WP_CLI_PATH} --allow-root cli version | awk '{ print $2 }') + dpkg --compare-versions ${WP_CLI_VERSION} lt 0.21.1 + # Update WP-CLI version + if [ "$?" == "0" ]; then + wget -qO ${WP_CLI_PATH} https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar + chmod +x ${WP_CLI_PATH} + fi + fi +} + # Install EasyEngine 3.x function ee_install() { @@ -563,6 +581,7 @@ else ee_git_init | tee -ai $ee_install_log service nginx reload &>> /dev/null service php5-fpm restart &>> /dev/null + ee_update_wp_cli | tee -ai $ee_install_log else ee_lib_error "Not updating EasyEngine to $ee_version_new, exit status = " 1 fi diff --git a/setup.py b/setup.py index 05c072dc..30d99520 100644 --- a/setup.py +++ b/setup.py @@ -54,7 +54,7 @@ except Exception as e: os.system("git config --global user.email {0}".format(ee_email)) setup(name='ee', - version='3.3.14', + version='3.3.15', description=long_description, long_description=long_description, classifiers=[],