From 3d34d9899284267ffec3fe673a18fd945a41edb0 Mon Sep 17 00:00:00 2001
From: tshenry <taylor@discourse.org>
Date: Fri, 8 Jan 2021 21:08:05 -0800
Subject: [PATCH] FEATURE: Add validation to admin email prompt in
 discourse-setup (#514)

---
 discourse-setup | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/discourse-setup b/discourse-setup
index ec1adaf..b4472a6 100755
--- a/discourse-setup
+++ b/discourse-setup
@@ -383,11 +383,25 @@ ask_user_for_config() {
 
     if [ ! -z "$developer_emails" ]
     then
-      read -p "Email address for admin account(s)? [$developer_emails]: " new_value
-      if [ ! -z "$new_value" ]
-      then
-          developer_emails="$new_value"
-      fi
+      local email_valid="n"
+      until [ "$email_valid" == "y" ]
+      do
+        read -p "Email address for admin account(s)? [$developer_emails]: " new_value
+        if [ ! -z "$new_value" ]
+        then
+          if [[ ${#new_value} -ge 7 && $new_value == *@* ]]
+          then
+            developer_emails="$new_value"
+            email_valid="y"
+          else
+            echo
+            echo "[Error] Invalid email address"
+            echo
+          fi
+        else
+          email_valid="y"
+        fi
+      done
     fi
 
     if [ ! -z "$smtp_address" ]
-- 
2.25.1