EasyEngine v1.3.6

CHANGELOG.txt

@@ -1,3 +1,7 @@
+v 1.3.6 - Apr 24, 2014
+  - Fixed Nginx Update Problem #201
+  - Automate Testing Using Travis-ci
+
 v 1.3.5 - Apr 22, 2014
   - Update nginx to the latest stable version (1.4.7)
 

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.5"
+	echo "easyengine version: 1.3.6"
 
 # Easy Engine Info
 elif [ "$1" = "info" ]

usr/local/sbin/eeupdate

@@ -474,21 +474,25 @@ EE134()
 {
 	if [ "$LINUX_DISTRO" == "Ubuntu" ]
 	then
-		# Removing Old Nginx Repository
+		nginx -v 2>&1 | grep 1.4.7
-		rm /etc/apt/sources.list.d/brianmercer-nginx*
+		if [ $? -ne 0 ]
+		then
+			# Removing Old Nginx Repository
+			rm /etc/apt/sources.list.d/brianmercer-nginx*
 
-		# Add rtCamp Nginx Launchpad Repository
+			# Add rtCamp Nginx Launchpad Repository
-		echo -e "\033[34mAdding rtCamp Nginx Launchpad Repository, Please Wait...\e[0m"
+			echo -e "\033[34mAdding rtCamp Nginx Launchpad Repository, Please Wait...\e[0m"
-		add-apt-repository -y ppa:rtcamp/nginx &>> $INSTALLLOG \
+			add-apt-repository -y ppa:rtcamp/nginx &>> $INSTALLLOG \
-		|| OwnError "Unable To Add Nginx Launchpad Repository" 
+			|| OwnError "Unable To Add Nginx Launchpad Repository" 
 
-		# Update The APT Cache
+			# Update The APT Cache
-		echo -e "\033[34mUpdating APT Cache, Please Wait...\e[0m"
+			echo -e "\033[34mUpdating APT Cache, Please Wait...\e[0m"
-		apt-get update &>> $INSTALLLOG || OwnError "Unable To Update APT Cache"
+			apt-get update &>> $INSTALLLOG || OwnError "Unable To Update APT Cache"
 
-		# Update Nginx
+			# Update Nginx
-		apt-get -o Dpkg::Options::="--force-confold" -y install nginx-custom \
+			apt-get -o Dpkg::Options::="--force-confold" -y install nginx-custom \
-		|| OwnError "Unable To Update Nginx"
+			|| OwnError "Unable To Update Nginx"
+		fi
 	fi
 }
 
@@ -596,7 +600,7 @@ then
 			EECURRENTVERSION="1.3.4"
 		fi
 
-		if [[ $EECURRENTVERSION = 1.3.4 ]]
+		if [[ $EECURRENTVERSION = 1.3.4 ]] || [[ $EECURRENTVERSION = 1.3.5 ]]
 		then
 			EE134
 		fi