From 9e5b810b025c63859ae9c75d6d7ce40a56df90bf Mon Sep 17 00:00:00 2001
From: kaibae19 <99116238+kaibae19@users.noreply.github.com>
Date: Sun, 3 Apr 2022 11:59:29 -0700
Subject: [PATCH] Update questions.sh

---
 setup/questions.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/setup/questions.sh b/setup/questions.sh
index 8efe6939..ca847964 100644
--- a/setup/questions.sh
+++ b/setup/questions.sh
@@ -83,13 +83,14 @@ address, so we're suggesting $DEFAULT_PRIMARY_HOSTNAME.
 	fi
 fi
 
-
 # Are we running an external CalDAV and CardDAV server?  This will default the variable NC_HOSTNAME to
 # PRIMARY_HOSTNAME unless it is changed. If change, Nextcloud installation is omitted from this setup script
-    input_box "External Cal/CardDAV server" \
+if [ -z "${DAV_HOSTNAME:-}" ]; then
+    DAV_HOSTNAME=$PRIMARY_HOSTNAME
+    input_box "External CalDAV/CardDAV Server" \
 "Are you using an external server for CalDAV and CardDAV (Nextcloud), if so, enter the FQDN of the server. \
-IMPORTANT: Changing this from the default will omit the installation of Nextcloud on this system."
-    $PRIMARY_HOSTNAME \
+\n\nIMPORTANT: Changing this from the default will omit the installation of Nextcloud on this system."
+    $DAV_HOSTNAME \
     DAV_HOSTNAME
 
 # If the machine is behind a NAT, inside a VM, etc., it may not know