From 11c19320491f15e6890a60d8d1e4c0dba157271b Mon Sep 17 00:00:00 2001
From: Derek Crudgington <derek@federated.company>
Date: Mon, 17 Apr 2023 16:02:06 +0000
Subject: [PATCH] Removed interactive install to only use .env now

---
 bin/.env              | 14 +++++++-------
 bin/install-federated | 24 +++++++-----------------
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/bin/.env b/bin/.env
index 3051759..5680a77 100644
--- a/bin/.env
+++ b/bin/.env
@@ -1,17 +1,17 @@
 # Domain name
-#DOMAIN="test.com"
+DOMAIN="test.com"
 
 # Company name
-#COMPANY="Fang Free Inc"
+COMPANY="Fang Free Inc"
 
-# Country
-#COUNTRY="US"
+# Country Code (US, HK, GB, JP, etc)
+COUNTRY="US"
 
 # Administrator password
-#ADMINPASS="password123"
+ADMINPASS="password123"
 
-# Backblaze KeyID (Master Key)
+# Backblaze KeyID (Master Key) for backups
 B2_APPLICATION_KEY_ID="3239c6765fdc"
 
-# Backblaze Application Key
+# Backblaze Application Key for backups
 B2_APPLICATION_KEY="0050ac8837466cbca0e0aa574b5f8332f706a5e26c"
diff --git a/bin/install-federated b/bin/install-federated
index 6d30490..ed2cd9c 100755
--- a/bin/install-federated
+++ b/bin/install-federated
@@ -46,24 +46,14 @@ get_config() {
     [ -z "$COMPANY" ] && failcheck "/federated/bin/.env doesn't include COMPANY"
     [ -z "$COUNTRY" ] && failcheck "/federated/bin/.env doesn't include COUNTRY"
     [ -z "$ADMINPASS" ] && failcheck "/federated/bin/.env doesn't include ADMINPASS"
-    exit 2;
+    if ! printf '%s\0' "${COUNTRIES[@]}" | grep -Fxqz -- "$COUNTRY"; then
+      failcheck "$COUNTRY is not a valid country code. Use US, GB, HK, etc" 
+    fi
+    [ -z "$B2_APPLICATION_KEY_ID" ] && echo -ne "\nWarning: B2_APPLICATION_KEY_ID doesn't exist in .env\nBackups will be disabled"
+    [ -z "$B2_APPLICATION_KEY" ] && echo -ne "\nWarning: B2_APPLICATION_KEY doesn't exist in .env\nBackups will be disabled"
   else
-    echo -ne "\nFederated Stack install script\n\n"
-    read -p '* Enter domain name (domain.com): ' DOMAIN
-    read -p '* Enter company name (Domain Company): ' COMPANY
-    read -p '* Enter country code: ' COUNTRY
-    while [ true ]; do
-      if printf '%s\0' "${COUNTRIES[@]}" | grep -Fxqz -- "$COUNTRY"; then
-        break
-      else
-        read -p "* Invalid, choose a country code (US, GB, HK, etc): " COUNTRY
-      fi
-    done
-    read -sp '* Enter admin password to use for initial login: ' ADMINPASS
-    [ -z "$DOMAIN" ] && failcheck "Must enter a domain name"
-    [ -z "$COMPANY" ] && failcheck "Must enter a company name"
-    [ -z "$ADMINPASS" ] && failcheck "Must enter a admin password"
-  fi
+    failcheck "/federated/bin/.env doesn't exist"
+  fi 
 }
 
 while getopts d OPTION; do