From 74c44c6183a5b7872168b0f3512f7af675e4fe13 Mon Sep 17 00:00:00 2001
From: Ian Roberts <i.roberts@dcs.shef.ac.uk>
Date: Sun, 30 Jul 2023 23:57:53 +0100
Subject: [PATCH] We need generate-docker-env *not* to load the existing .env
 itself when it is run as part of a get-teamware upgrade, since that would
 overwrite the variables we have just been carefully gathering from the user

---
 generate-docker-env.sh  | 4 +++-
 install/get-teamware.sh | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/generate-docker-env.sh b/generate-docker-env.sh
index c8ae2cae..9018c83f 100755
--- a/generate-docker-env.sh
+++ b/generate-docker-env.sh
@@ -20,7 +20,9 @@ if [ -f .env ]; then
   cp .env saved-env.$BAKNAME
 
   # load any existing environment variables from .env
-  . .env
+  if [ -z "$SKIP_EXISTING_ENV" ]; then
+    . .env
+  fi
    sed -n '/^### generate-docker-env\.sh will not touch anything below this line/,$p' .env | sed 1d > .env.tmpsave
 fi
 
diff --git a/install/get-teamware.sh b/install/get-teamware.sh
index 3f76c207..477f148f 100644
--- a/install/get-teamware.sh
+++ b/install/get-teamware.sh
@@ -263,6 +263,8 @@ chmod 644 nginx/*.template Caddyfile
 
 echo "Generating configuration file"
 
+# tell generate-docker-env not to load an existing .env itself, since we already have
+SKIP_EXISTING_ENV=yes
 source ./generate-docker-env.sh
 
 if [ "${COMPOSE[0]/ /_}" = "${COMPOSE[0]}" ]; then