From 36d0b7662cb389fcf5892a6ec860269cb433ff02 Mon Sep 17 00:00:00 2001 From: gau1991 Date: Thu, 28 May 2015 14:14:52 +0530 Subject: [PATCH 1/2] Fixed issue in install script --- CHANGELOG.txt | 3 --- ee/core/variables.py | 2 +- install | 4 ++-- setup.py | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 5ff2013e..c9f4769b 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,3 @@ -v 3.2.1 - May 28, 2015 -- Fixed ee update branch issue - v 3.2.0 - May 28, 2015 - Now using openSuse builder to build Nginx package for both Ubuntu and Debian - Minor fixes and improvements diff --git a/ee/core/variables.py b/ee/core/variables.py index 7ecbd959..b2ca3e4b 100644 --- a/ee/core/variables.py +++ b/ee/core/variables.py @@ -12,7 +12,7 @@ class EEVariables(): """Intialization of core variables""" # EasyEngine version - ee_version = "3.2.1" + ee_version = "3.2.0" # EasyEngine packages versions ee_wp_cli = "0.19.1" diff --git a/install b/install index 738b5bc6..dd63f462 100644 --- a/install +++ b/install @@ -48,7 +48,7 @@ fi # Define variables for later use ee_branch=$1 readonly ee_version_old="2.2.3" -readonly ee_version_new="3.2.1" +readonly ee_version_new="3.2.0" readonly ee_log_dir=/var/log/ee/ readonly ee_install_log=/var/log/ee/install.log readonly ee_linux_distro=$(lsb_release -i | awk '{print $3}') @@ -294,7 +294,7 @@ function ee_update_latest() fi elif [ "$ee_distro_version" == "trusty" ]; then if [ -f /etc/apt/sources.list.d/rtcamp-nginx-trusty.list ]; then - rm -rf /etc/apt/sources.list.d/rtcamp-trusty-precise.list + rm -rf /etc/apt/sources.list.d/rtcamp-nginx-trusty.list echo -e "\ndeb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/xUbuntu_14.04/ /" >> /etc/apt/sources.list.d/ee-repo.list gpg --keyserver "hkp://keys.gnupg.net" --recv-keys '3050AC3CD2AE6F03' gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add - diff --git a/setup.py b/setup.py index 0c1c2112..6a4905ea 100644 --- a/setup.py +++ b/setup.py @@ -54,7 +54,7 @@ except Exception as e: os.system("git config --global user.email {0}".format(ee_email)) setup(name='ee', - version='3.2.1', + version='3.2.0', description=long_description, long_description=long_description, classifiers=[], From 7b2e48e1ad8e7e8fc331230506ed8da931426470 Mon Sep 17 00:00:00 2001 From: gau1991 Date: Thu, 28 May 2015 14:35:39 +0530 Subject: [PATCH 2/2] Fixed its not returrning after version was still there --- install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install b/install index dd63f462..bfbbab4d 100644 --- a/install +++ b/install @@ -443,7 +443,7 @@ else ee_lib_error "Not updating EasyEngine to $ee_version_new, exit status = " 1 fi else - ee_lib_error "You already have EasyEngine $ee_version_new, exit status = " $? | tee -ai $ee_install_log + ee_lib_error "You already have EasyEngine $ee_version_new, exit status = " 1 fi fi ee sync | tee -ai $EE_INSTALL_LOG