Update linupx-scripts.sh

linupx-scripts.sh

@@ -478,8 +478,10 @@ POSTFIX_INSTALL(){
 	case "$choice" in 
 	[Nn]) INSTALL_MENU;;
 	* )
+		echo
 		echo -e "${Green}Select default options upon install as config will be overwritten by script at the end${Color_Off}"
 		read -n 1 -s -p "Press any key to continue"
+		echo
 		
 		$APTFUNC install -y postfix mailutils
 		cd /etc/postfix
@@ -489,11 +491,12 @@ POSTFIX_INSTALL(){
 		echo -e -n "${idsCL[LightCyan]}Server is internal or external (I/e): ${idsCL[Default]}"
 		read SERVERLOC
 		
+		if [ "${SERVERLOC}" = "" ]; then SERVERLOC=I; fi
+		
 		mv /etc/postfix/main.cf /etc/postfix/main.cf.bak
 		
 		case ${SERVERLOC} in
 			[Ii]) wget https://git.schroedercity.com/voltron/Misc-Scripts/raw/branch/master/defaults/main.cf -O /etc/postfix/main.cf;;
-				
 			[Ee])
 				echo
 				echo -e -n "${idsCL[LightCyan]}Username for scity.us domain email: ${idsCL[Default]}"
@@ -506,6 +509,7 @@ POSTFIX_INSTALL(){
 				echo "mail.scity.us ${USERNAME}@scity.us:${PASSWORD}" > /etc/postfix/sasl_passwd
 				sudo chmod 600 /etc/postfix/sasl_passwd
 				sudo postmap /etc/postfix/sasl_passwd
+				sudo rm -f /etc/postfix/sasl_passwd
 				;;
 		esac
 		
@@ -516,16 +520,12 @@ POSTFIX_INSTALL(){
 		read pfhostname
 		echo ""
 	
-		if [ "${pfhostname}" = "" ]; then
-			pfhostname=${hostname}
-		fi
+		if [ "${pfhostname}" = "" ]; then pfhostname=${hostname}; fi
 		
 		read -p "Default from email (portion before @scity.us, Default = \"${hostname}\"): " pffromemail
 		echo ""
 		
-		if [ "${pffromemail}" = "" ]; then
-			pffromemail=${hostname}
-		fi
+		if [ "${pffromemail}" = "" ]; then pffromemail=${hostname}; fi
 		
 		sed -i "s/<<HOSTNAME>>/${pfhostname}/g" main.cf
 		sed -i "s/<<FROMEMAIL>>/${pffromemail}/g" sender_canonical