From 3ac3fe267f913def32e5c262cbed6aa4bedaeb50 Mon Sep 17 00:00:00 2001
From: juewuy <juewuy@126.com>
Date: Thu, 19 Jan 2023 22:01:39 +0800
Subject: [PATCH] =?UTF-8?q?v1.6.16b=20~=E6=A0=B8=E5=BF=83=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E6=8F=90=E7=A4=BA=E5=8F=8A=E6=B5=81=E7=A8=8B=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20~=E6=9C=AC=E6=9C=BA=E4=BB=A3=E7=90=86=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82=E4=BC=98=E5=8C=96=20~=E4=BF=AE=E5=A4=8D=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=83=85=E5=86=B5=E4=B8=8B=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/clash.sh | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/scripts/clash.sh b/scripts/clash.sh
index 435119d..c6e00d1 100644
--- a/scripts/clash.sh
+++ b/scripts/clash.sh
@@ -792,11 +792,24 @@ localproxy(){
 	elif [ "$num" = 1 ]; then
 		echo -----------------------------------------------
 		if [ "$local_proxy" = "未开启" ]; then 
-			local_proxy=已开启
-			setconfig local_proxy $local_proxy
-			setconfig local_type $local_type
-			echo -e "\033[32m已经成功使用$local_type方式配置本机代理~\033[0m"
-			sleep 1
+			if [ -n "$authentication" ] && [ "$authentication" != "未设置" ] ;then
+				echo -e "\033[32m检测到您已经设置了Http/Sock5代理密码，请先取消密码！\033[0m"
+				sleep 1
+				setport
+				localproxy
+			else
+				local_proxy=已开启
+				setconfig local_proxy $local_proxy
+				setconfig local_type $local_type
+				echo -e "\033[32m已经成功使用$local_type方式配置本机代理~\033[0m"
+				if [ "$local_type" = "环境变量" ];then
+					$clashdir/start.sh set_proxy $mix_port $db_port
+					echo -e "\033[36m如未生效，请重新启动终端或重新连接SSH！\033[0m"
+				else
+					echo -e "\033[36m请重新启动clash服务！\033[0m"
+				fi
+				sleep 1
+			fi		
 		else
 			local_proxy=未开启
 			setconfig local_proxy $local_proxy