We need generate-docker-env *not* to load the existing .env itself wh…

…en 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

@@ -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
 

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