From e03fc05da9556ed2944c634ea9d9b79faf1c1fb9 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 22 May 2022 16:28:17 -0500
Subject: [PATCH] Update install-postfix.sh

---
 install-postfix.sh | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/install-postfix.sh b/install-postfix.sh
index a130edd..e78eacc 100755
--- a/install-postfix.sh
+++ b/install-postfix.sh
@@ -20,8 +20,8 @@ case "$choice" in
 	service stop postfix
 	
 	echo
-	echo -e -n "${idsCL[LightCyan]}Server is 'i'nternal or 'e'xternal (i=default): ${idsCL[Default]}"
-	read SERVERLOC
+	echo -e -n "${idsCL[LightCyan]}Server is 'I'nternal or 'E'xternal? ${idsCL[Default]}"
+	read -i "I" SERVERLOC
 	
 	if [ "${SERVERLOC}" = "" ]; then SERVERLOC=I; fi
 	
@@ -36,7 +36,7 @@ case "$choice" in
 		[Ee])
 			echo
 			echo -e -n "${idsCL[LightCyan]}Username for scity.us domain email: ${idsCL[Default]}"
-			read USERNAME
+			read -i "systems" USERNAME
 			echo
 			echo -e -n "${idsCL[LightCyan]}Password for scity.us domain email: ${idsCL[Default]}"
 			read -s PASSWORD
@@ -52,17 +52,14 @@ case "$choice" in
 	wget https://git.schroedercity.com/voltron/Misc-Scripts/raw/branch/master/defaults/sender_canonical -O /etc/postfix/sender_canonical
 	
 	hostname=`hostname`
-	echo -e -n "${idsCL[LightCyan]}Server Name (Default = \"${hostname}\"): ${idsCL[Default]}"
-	read pfhostname
-	echo ""
-
-	if [ "${pfhostname}" = "" ]; then pfhostname=${hostname}; fi
-	
-	read -p "Default from email (portion before @scity.us, Default = \"${hostname}\"): " pffromemail
+	echo -e -n "${idsCL[LightCyan]}Server Name: ${idsCL[Default]}"
+	read  -i "${hostname}" pfhostname
 	echo ""
 	
-	if [ "${pffromemail}" = "" ]; then pffromemail=${hostname}; fi
-	
+	echo -e -n "${idsCL[LightCyan]}Default from email (portion before @scity.us): ${idsCL[Default]}"
+	read  -i "${hostname}" pffromemail
+	echo ""
+		
 	sed -i "s/<<HOSTNAME>>/${pfhostname}/g" main.cf
 	sed -i "s/<<FROMEMAIL>>/${pffromemail}/g" sender_canonical