From 803e9e00e0340dd5c445520563ad06fa40f3e6cf Mon Sep 17 00:00:00 2001
From: Joe Carstairs <me@joeac.net>
Date: Fri, 3 Jul 2026 10:49:19 +0100
Subject: [PATCH] install.sh picks up where left off with env vars

---
 install.sh | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/install.sh b/install.sh
index cd79c95..5b1f02d 100644
--- a/install.sh
+++ b/install.sh
@@ -29,11 +29,14 @@ then
   sudo ln -s /home/joeac.net/joeac.net /usr/local/lib/joeac.net
 fi
 
-if [ -z "${DIGITALOCEAN_TOKEN}" ]
+if ! [ -f DIGITALOCEAN_TOKEN ]
 then
-  read -sp "DIGITALOCEAN_TOKEN: " DIGITALOCEAN_TOKEN
+  if [ -z "${DIGITALOCEAN_TOKEN}" ]
+  then
+    read -sp "DIGITALOCEAN_TOKEN: " DIGITALOCEAN_TOKEN
+  fi
+  echo ${DIGITALOCEAN_TOKEN} > DIGITALOCEAN_TOKEN
 fi
-echo ${DIGITALOCEAN_TOKEN} > DIGITALOCEAN_TOKEN
 
 if ! ( podman secret exists remote_smtp_password )
 then
@@ -50,6 +53,12 @@ do
   if expr "${line}" : "^[[:alnum:]_]\+=" 1>/dev/null
   then
     var_name="$(expr "${line}" "^\([[:alnum:]_]\+\)=")"
+
+    if [ -n "$(grep "^${var_name}=" .env)" ]
+    then
+      continue
+    fi
+
     if [ -z "${!var_name}" ]
     then
       default_value="$(expr "${line}" "^[[:alnum:]_]\+=\(.*\)\$")"
@@ -59,6 +68,7 @@ do
         eval ${var_name}="${default_value}"
       fi
     fi
+
     echo "${var_name}=${!var_name}" >> .env
   fi
 done <example.env