diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 57ce198d..f459f269 100644 --- a/CHANGELOG.txt +++ b/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) diff --git a/usr/local/sbin/easyengine b/usr/local/sbin/easyengine index 88ee4d41..f324ccd3 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.5" + echo "easyengine version: 1.3.6" # Easy Engine Info elif [ "$1" = "info" ] diff --git a/usr/local/sbin/eeupdate b/usr/local/sbin/eeupdate index 7113f6e8..1414547e 100644 --- a/usr/local/sbin/eeupdate +++ b/usr/local/sbin/eeupdate @@ -474,21 +474,25 @@ EE134() { if [ "$LINUX_DISTRO" == "Ubuntu" ] then - # Removing Old Nginx Repository - rm /etc/apt/sources.list.d/brianmercer-nginx* + nginx -v 2>&1 | grep 1.4.7 + if [ $? -ne 0 ] + then + # Removing Old Nginx Repository + rm /etc/apt/sources.list.d/brianmercer-nginx* - # Add rtCamp Nginx Launchpad Repository - echo -e "\033[34mAdding rtCamp Nginx Launchpad Repository, Please Wait...\e[0m" - add-apt-repository -y ppa:rtcamp/nginx &>> $INSTALLLOG \ - || OwnError "Unable To Add Nginx Launchpad Repository" + # Add rtCamp Nginx Launchpad Repository + echo -e "\033[34mAdding rtCamp Nginx Launchpad Repository, Please Wait...\e[0m" + add-apt-repository -y ppa:rtcamp/nginx &>> $INSTALLLOG \ + || OwnError "Unable To Add Nginx Launchpad Repository" - # Update The APT Cache - echo -e "\033[34mUpdating APT Cache, Please Wait...\e[0m" - apt-get update &>> $INSTALLLOG || OwnError "Unable To Update APT Cache" + # Update The APT Cache + echo -e "\033[34mUpdating APT Cache, Please Wait...\e[0m" + apt-get update &>> $INSTALLLOG || OwnError "Unable To Update APT Cache" - # Update Nginx - apt-get -o Dpkg::Options::="--force-confold" -y install nginx-custom \ - || OwnError "Unable To Update Nginx" + # Update Nginx + apt-get -o Dpkg::Options::="--force-confold" -y install nginx-custom \ + || 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