From 1c8c468adc6af7c496a798e9c631690410b591b1 Mon Sep 17 00:00:00 2001
From: Mitesh Shah <Mr.Miteshah@gmail.com>
Date: Tue, 29 Apr 2014 16:56:59 +0530
Subject: [PATCH] EasyEngine v1.3.7

---
 CHANGELOG.txt             |  7 +++++++
 usr/local/sbin/easyengine |  2 +-
 usr/local/sbin/eeupdate   | 29 +++++++++++++++++++++++++++--
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8467bffb..d1da726f 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,10 @@
+v 1.3.7 - Apr 29, 2014
+  - Fixed EasyEngine Update Problem
+  - Fixed Issue #206
+  - Update nginx version 1.6.0
+  - Update wp-cli version 0.14.1
+
+
 v 1.3.6 - Apr 24, 2014
   - Fixed Nginx Update Problem #201
   - Automate Testing Using Travis-ci
diff --git a/usr/local/sbin/easyengine b/usr/local/sbin/easyengine
index f324ccd3..9c8520ac 100644
--- a/usr/local/sbin/easyengine
+++ b/usr/local/sbin/easyengine
@@ -1965,7 +1965,7 @@ if [ "$1" = "version" ] || [ "$1" = "--version" ] || [ "$1" = "-v" ]
 then
 
 	# Display Easy Engine Version
-	echo "easyengine version: 1.3.6"
+	echo "easyengine version: 1.3.7"
 
 # Easy Engine Info
 elif [ "$1" = "info" ]
diff --git a/usr/local/sbin/eeupdate b/usr/local/sbin/eeupdate
index 1414547e..77fdcfd4 100644
--- a/usr/local/sbin/eeupdate
+++ b/usr/local/sbin/eeupdate
@@ -472,9 +472,10 @@ EE133()
 
 EE134()
 {
+	# Nginx Update
 	if [ "$LINUX_DISTRO" == "Ubuntu" ]
 	then
-		nginx -v 2>&1 | grep 1.4.7
+		nginx -v 2>&1 | grep 1.6.0
 		if [ $? -ne 0 ]
 		then
 			# Removing Old Nginx Repository
@@ -494,6 +495,25 @@ EE134()
 			|| OwnError "Unable To Update Nginx"
 		fi
 	fi
+	# WP-CLI Update
+	WP_CLI_VERSION=$(wp --allow-root --info | grep "WP-CLI version" | awk '{print $3}')
+	if [[ $WP_CLI_VERSION != "0.14.1" ]]
+	then
+        echo -e "\033[34mUpdating WP-CLI, Please Wait...\e[0m"
+        #Remove Old WP-CLI
+		rm -rf /usr/share/easyengine/wp-cli  /usr/bin/wp /etc/bash_completion.d/wp-completion.bash
+
+		curl -sL https://raw.github.com/wp-cli/wp-cli.github.com/master/installer.sh | INSTALL_DIR='/usr/share/easyengine/wp-cli' VERSION='0.14.1' bash &>> $INSTALLLOG \
+		|| OwnError "Unable To Update WP-CLI"
+
+		# Add WP-CLI Command In PATH Variable
+		ln -s /usr/share/easyengine/wp-cli/bin/wp /usr/bin/wp || OwnError "Unable To Create Symbolic Link For WP-CLI Command"
+
+		# Add WP-CLI Auto Completion
+		cp -i /usr/share/easyengine/wp-cli/vendor/wp-cli/wp-cli/utils/wp-completion.bash /etc/bash_completion.d/
+		source /etc/bash_completion.d/wp-completion.bash
+	fi
+
 }
 
 HTTPAUTH()
@@ -585,6 +605,11 @@ then
 		if [[ $EECURRENTVERSION = 1.1.0 ]]
 		then
 			EE110
+			EECURRENTVERSION="1.1.1"
+		fi
+
+		if [[ $EECURRENTVERSION = 1.1.1 ]] || [[ $EECURRENTVERSION = 1.1.2 ]] || [[ $EECURRENTVERSION = 1.1.3 ]] || [[ $EECURRENTVERSION = 1.1.4 ]] || [[ $EECURRENTVERSION = 1.1.5 ]] || [[ $EECURRENTVERSION = 1.2.0 ]] || [[ $EECURRENTVERSION = 1.2.1]]
+		then
 			EECURRENTVERSION="1.2.2"
 		fi
 
@@ -600,7 +625,7 @@ then
 			EECURRENTVERSION="1.3.4"
 		fi
 
-		if [[ $EECURRENTVERSION = 1.3.4 ]] || [[ $EECURRENTVERSION = 1.3.5 ]]
+		if [[ $EECURRENTVERSION = 1.3.4 ]] || [[ $EECURRENTVERSION = 1.3.5 ]] || || [[ $EECURRENTVERSION = 1.3.6 ]]
 		then
 			EE134
 		fi