Skip to content

Commit 8432f2c

Browse files
committed
EasyEngine v1.3.6
1 parent 2fb75e3 commit 8432f2c

File tree

3 files changed

+22
-14
lines changed

3 files changed

+22
-14
lines changed

CHANGELOG.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
v 1.3.6 - Apr 24, 2014
2+
- Fixed Nginx Update Problem #201
3+
- Automate Testing Using Travis-ci
4+
15
v 1.3.5 - Apr 22, 2014
26
- Update nginx to the latest stable version (1.4.7)
37

usr/local/sbin/easyengine

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1965,7 +1965,7 @@ if [ "$1" = "version" ] || [ "$1" = "--version" ] || [ "$1" = "-v" ]
19651965
then
19661966

19671967
# Display Easy Engine Version
1968-
echo "easyengine version: 1.3.5"
1968+
echo "easyengine version: 1.3.6"
19691969

19701970
# Easy Engine Info
19711971
elif [ "$1" = "info" ]

usr/local/sbin/eeupdate

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -474,21 +474,25 @@ EE134()
474474
{
475475
if [ "$LINUX_DISTRO" == "Ubuntu" ]
476476
then
477-
# Removing Old Nginx Repository
478-
rm /etc/apt/sources.list.d/brianmercer-nginx*
477+
nginx -v 2>&1 | grep 1.4.7
478+
if [ $? -ne 0 ]
479+
then
480+
# Removing Old Nginx Repository
481+
rm /etc/apt/sources.list.d/brianmercer-nginx*
479482

480-
# Add rtCamp Nginx Launchpad Repository
481-
echo -e "\033[34mAdding rtCamp Nginx Launchpad Repository, Please Wait...\e[0m"
482-
add-apt-repository -y ppa:rtcamp/nginx &>> $INSTALLLOG \
483-
|| OwnError "Unable To Add Nginx Launchpad Repository"
483+
# Add rtCamp Nginx Launchpad Repository
484+
echo -e "\033[34mAdding rtCamp Nginx Launchpad Repository, Please Wait...\e[0m"
485+
add-apt-repository -y ppa:rtcamp/nginx &>> $INSTALLLOG \
486+
|| OwnError "Unable To Add Nginx Launchpad Repository"
484487

485-
# Update The APT Cache
486-
echo -e "\033[34mUpdating APT Cache, Please Wait...\e[0m"
487-
apt-get update &>> $INSTALLLOG || OwnError "Unable To Update APT Cache"
488+
# Update The APT Cache
489+
echo -e "\033[34mUpdating APT Cache, Please Wait...\e[0m"
490+
apt-get update &>> $INSTALLLOG || OwnError "Unable To Update APT Cache"
488491

489-
# Update Nginx
490-
apt-get -o Dpkg::Options::="--force-confold" -y install nginx-custom \
491-
|| OwnError "Unable To Update Nginx"
492+
# Update Nginx
493+
apt-get -o Dpkg::Options::="--force-confold" -y install nginx-custom \
494+
|| OwnError "Unable To Update Nginx"
495+
fi
492496
fi
493497
}
494498

@@ -596,7 +600,7 @@ then
596600
EECURRENTVERSION="1.3.4"
597601
fi
598602

599-
if [[ $EECURRENTVERSION = 1.3.4 ]]
603+
if [[ $EECURRENTVERSION = 1.3.4 ]] || [[ $EECURRENTVERSION = 1.3.5 ]]
600604
then
601605
EE134
602606
fi

0 commit comments

Comments
 (0)