From 4ea1607ce65ff645d988e6214ba170e04f09881e Mon Sep 17 00:00:00 2001 From: Mitesh Shah Date: Wed, 13 Aug 2014 15:30:36 +0530 Subject: [PATCH] EasyEngine 2.0.2 --- CHANGELOG.txt | 3 +++ bin/update | 17 ++++++++++++++--- docs/index.md | 3 --- src/lib/ee_lib_variables.sh | 2 +- 4 files changed, 18 insertions(+), 7 deletions(-) delete mode 100644 docs/index.md diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 448047fb..caaacd8d 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,6 @@ +v 2.0.2 - July 21, 2014 + - Remote MySQL Support + v 2.0.1 - July 21, 2014 - Fixed wp-cli installation #289 diff --git a/bin/update b/bin/update index bb8accd5..cf770751 100644 --- a/bin/update +++ b/bin/update @@ -155,6 +155,9 @@ if [[ $EE_CURRENT_VERSION < $EE_LATEST_VERSION ]]; then for ee_include in $(find /usr/local/lib/easyengine/ -iname "*.sh"); do source $ee_include done + + # Avoid re-source and readonly errors + ee_source=1 # Lets modify the $EE_COMMAND_LOG value # So all the logs write in $EE_UPDATE_LOG @@ -383,11 +386,14 @@ if [[ $EE_CURRENT_VERSION < $EE_LATEST_VERSION ]]; then fi if [[ $EE_CURRENT_VERSION < 2.0.1 ]]; then + # Lets re-used our functions # Include library - for ee_include in $(find /usr/local/lib/easyengine/ -iname "*.sh"); do - source $ee_include - done + if [ $ee_source != 1 ]; then + for ee_include in $(find /usr/local/lib/easyengine/ -iname "*.sh"); do + source $ee_include + done + fi if [[ $EE_CURRENT_VERSION = 2.0.0 ]]; then dpkg -l | grep php5-fpm &>> $EE_UPDATE_LOG @@ -399,6 +405,11 @@ if [[ $EE_CURRENT_VERSION < $EE_LATEST_VERSION ]]; then # Install WP-CLI ee_ven_install_wpcli fi + # Update EasyEngine current version + EE_CURRENT_VERSION="2.0.1" + fi + if [[ $EE_CURRENT_VERSION = 2.0.1 ]]; then + sed -i 's/host =.*/grant-host = localhost/' /etc/easyengine/ee.conf fi fi diff --git a/docs/index.md b/docs/index.md deleted file mode 100644 index ff4c324f..00000000 --- a/docs/index.md +++ /dev/null @@ -1,3 +0,0 @@ -### Test - -Markdown diff --git a/src/lib/ee_lib_variables.sh b/src/lib/ee_lib_variables.sh index 7a1a767d..cb2ee37a 100644 --- a/src/lib/ee_lib_variables.sh +++ b/src/lib/ee_lib_variables.sh @@ -1,7 +1,7 @@ # Define global variables # EasyEngine version -readonly EE_VERSION='2.0.1' +readonly EE_VERSION='2.0.2' # WP-CLI version readonly EE_WP_CLI_VERSION='0.16.0'