From a2155a8fc80fcbb5eb4e0176b61e0afab545e69f Mon Sep 17 00:00:00 2001
From: mack-a <57424792+mack-a@users.noreply.github.com>
Date: Wed, 21 Sep 2022 15:59:33 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=84=9A=E6=9C=AC):=20=E7=A7=BB=E9=99=A4l?=
 =?UTF-8?q?etsencrypt=E7=94=B3=E8=AF=B7=E8=AF=81=E4=B9=A6=E6=97=B6?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E9=82=AE=E7=AE=B1=E3=80=81=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=9B=9E=E8=BD=A6=E9=BB=98=E8=AE=A4SSL=E5=8E=82=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.sh | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/install.sh b/install.sh
index a459e09..960ffe5 100644
--- a/install.sh
+++ b/install.sh
@@ -1021,7 +1021,7 @@ checkIP() {
 # 自定义email
 customSSLEmail() {
 	if [[ -d "/root/.acme.sh" && -f "/root/.acme.sh/account.conf" ]]; then
-		if ! grep -q "ACCOUNT_EMAIL" <"/root/.acme.sh/account.conf"; then
+		if ! grep -q "ACCOUNT_EMAIL" <"/root/.acme.sh/account.conf" && ! echo "${sslType}" | grep -q "letsencrypt"; then
 			read -r -p "请输入邮箱地址:" sslEmail
 			if echo "${sslEmail}" | grep -q "@"; then
 				echo "ACCOUNT_EMAIL='${sslEmail}'" >>/root/.acme.sh/account.conf
@@ -1039,28 +1039,25 @@ customSSLEmail() {
 switchSSLType() {
 	if [[ -z "${sslType}" ]]; then
 		echoContent red "\n=============================================================="
-		echoContent yellow "1.letsencrypt"
+		echoContent yellow "1.letsencrypt[默认]"
 		echoContent yellow "2.zerossl"
 		echoContent yellow "3.buypass"
 		echoContent red "=============================================================="
-		read -r -p "请选择:" selectSSLType
-		if [[ "${selectSSLType}" =~ ^[1-3]$ ]]; then
-
-			case ${selectSSLType} in
-			1)
-				sslType="letsencrypt"
-				;;
-			2)
-				sslType="zerossl"
-				;;
-			3)
-				sslType="buypass"
-				;;
-			esac
-		else
-			echoContent red " ---> 选择错误，请重新选择"
-			switchSSLType
-		fi
+		read -r -p "请选择[回车]使用默认:" selectSSLType
+		case ${selectSSLType} in
+		1)
+			sslType="letsencrypt"
+			;;
+		2)
+			sslType="zerossl"
+			;;
+		3)
+			sslType="buypass"
+			;;
+		*)
+			sslType="letsencrypt"
+			;;
+		esac
 	fi
 }
 # 安装TLS
@@ -4787,7 +4784,7 @@ menu() {
 	cd "$HOME" || exit
 	echoContent red "\n=============================================================="
 	echoContent green "作者:mack-a"
-	echoContent green "当前版本:v2.5.76"
+	echoContent green "当前版本:v2.5.77"
 	echoContent green "Github:https://github.com/mack-a/v2ray-agent"
 	echoContent green "描述:八合一共存脚本\c"
 	showInstallStatus