From ad6926ec1a0543ec6f359ffbce72ce035231b348 Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sleede.com>
Date: Wed, 14 Apr 2021 16:18:35 +0200
Subject: [PATCH] [bug] unable to cancel the upgrade before it begins

---
 CHANGELOG.md     | 3 +++
 setup/upgrade.sh | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 757ab20e0..9e34af1cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,8 +3,11 @@
 ## Next release
 - Updated React and its dependencies to 17.0.3 and matching
 - Fix a bug: unable to set date formats during installation
+- Fix a bug: unable to cancel the upgrade before it begins
+- `SUPERADMIN_EMAIL` renamed to `ADMINSYS_EMAIL`
 - [TODO DEPLOY] `rails fablab:stripe:set_gateway`
 - [TODO DEPLOY] `rails fablab:maintenance:rebuild_stylesheet`
+- [TODO DEPLOY] `\curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/scripts/rename-adminsys.sh | bash`
 
 ## v4.7.9
 - Updated dependency to OpenLab
diff --git a/setup/upgrade.sh b/setup/upgrade.sh
index 47f21f4dc..46d99369b 100644
--- a/setup/upgrade.sh
+++ b/setup/upgrade.sh
@@ -123,8 +123,9 @@ compile_assets()
 upgrade()
 {
   [[ "$YES_ALL" = "true" ]] && confirm="y" || read -rp "Proceed with the upgrade? (Y/n) " confirm </dev/tty
-  if [[ "$confirm" == "n" ]]; then exit 2; fi
+  if [[ "$confirm" = "n" ]]; then exit 2; fi
 
+  add_environments
   docker-compose pull "$SERVICE"
   if [[ $? = 1 ]]; then
     printf "An error occured, detected service name: %s\nExiting...", "$SERVICE"
@@ -184,7 +185,6 @@ proceed()
   parseparams "$@"
   config
   version_check
-  add_environments
   upgrade
   clean
 }