From e179241dc2340980830570581e83a26136de8ad5 Mon Sep 17 00:00:00 2001
From: juewuy <juewuy@126.com>
Date: Thu, 19 Jan 2023 21:57:11 +0800
Subject: [PATCH] =?UTF-8?q?v1.6.16b=20~=E4=BF=AE=E5=A4=8D=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E8=AE=BE=E5=A4=87=E5=AE=89=E8=A3=85=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/clash.sh   | 36 ++++++++++++++++--------------------
 scripts/getdate.sh |  7 +++----
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/scripts/clash.sh b/scripts/clash.sh
index 22f1613..435119d 100644
--- a/scripts/clash.sh
+++ b/scripts/clash.sh
@@ -24,6 +24,8 @@ ckstatus(){
 	touch /tmp/clash_start_time
 	#使用source加载配置文件
 	source $CFG_PATH
+	versionsh=$(cat $clashdir/init.sh | grep -E ^version= | sed 's/version=//')
+	[ -n "$versionsh" ] && versionsh_l=$versionsh
 	#设置默认核心资源目录
 	[ -z "$bindir" ] && bindir=$clashdir
 	#设置默认端口及变量
@@ -96,7 +98,7 @@ ckstatus(){
 	#检查执行权限
 	[ ! -x $clashdir/start.sh ] && chmod +x $clashdir/start.sh
 	#检查/tmp用户上传
-	[ -f /tmp/clash-linux* ] && chmod +x /tmp/clash-linux* && tmp_version=$(/tmp/clash-linux* -v)
+	[ -f /tmp/clash*linux* ] && chmod +x /tmp/clash*linux* && tmp_version=$(/tmp/clash*linux* -v)
 	[ -n "$tmp_version" ] && {
 		echo -e "\033[32m发现可用的内核文件\033[0m"
 		read -p "是否加载？(1/0) > " res
@@ -110,7 +112,7 @@ ckstatus(){
 				3) clashcore=clash.meta ;;
 				*) clashcore=clash ;;
 			esac
-			mv -f /tmp/clash-linux* $bindir/clash
+			mv -f /tmp/clash*linux* $bindir/clash
 			setconfig clashcore $clashcore
 			echo -----------------------------------------------
 		}
@@ -790,24 +792,11 @@ localproxy(){
 	elif [ "$num" = 1 ]; then
 		echo -----------------------------------------------
 		if [ "$local_proxy" = "未开启" ]; then 
-			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		
+			local_proxy=已开启
+			setconfig local_proxy $local_proxy
+			setconfig local_type $local_type
+			echo -e "\033[32m已经成功使用$local_type方式配置本机代理~\033[0m"
+			sleep 1
 		else
 			local_proxy=未开启
 			setconfig local_proxy $local_proxy
@@ -820,12 +809,17 @@ localproxy(){
 
 	elif [ "$num" = 2 ]; then
 		local_type="环境变量"
+		local_proxy=已开启
+		setconfig local_proxy $local_proxy
 		setconfig local_type $local_type
 		localproxy
 	elif [ "$num" = 3 ]; then
 		if [ -n "$local_enh" ];then
 			local_type="iptables增强模式"
+			local_proxy=已开启
+			setconfig local_proxy $local_proxy
 			setconfig local_type $local_type
+			
 		else
 			echo -e "\033[31m当前设备无法使用iptables增强模式！\033[0m"
 		fi
@@ -835,6 +829,8 @@ localproxy(){
 	elif [ "$num" = 4 ]; then
 		if [ -n "$local_enh" ];then
 			local_type="nftables增强模式"
+			local_proxy=已开启
+			setconfig local_proxy $local_proxy
 			setconfig local_type $local_type
 		else
 			echo -e "\033[31m当前设备无法使用nftables增强模式！\033[0m"
diff --git a/scripts/getdate.sh b/scripts/getdate.sh
index a0feb82..a2f2a03 100644
--- a/scripts/getdate.sh
+++ b/scripts/getdate.sh
@@ -389,8 +389,7 @@ setcpucore(){
 	echo -e "\033[31m仅适合脚本无法正确识别核心或核心无法正常运行时使用！\033[0m"
 	echo -e "当前可供在线下载的处理器架构为："
 	echo $cpucore_list | awk -F " " '{for(i=1;i<=NF;i++) {print i" "$i }}'
-	echo -e "如果您的CPU架构未在以上列表中，请运行【uname -a】命令,并复制好返回信息"
-	echo -e "之后前往 t.me/ShellClash 群提交或 github.com/juewuy/ShellClash 提交issue"
+	echo -e "不知道如何获取核心版本？请参考：\033[36;4mhttps://juewuy.github.io/bdaz\033[0m"
 	echo -----------------------------------------------
 	read -p "请输入对应数字 > " num
 	setcpucore=$(echo $cpucore_list | awk '{print $"'"$num"'"}' )
@@ -420,9 +419,9 @@ getcore(){
 		chmod +x /tmp/clash.new 
 		clashv=$($bindir/clash -v 2>/dev/null | sed 's/ linux.*//;s/.* //')
 		if [ -z "$clashv" ];then
-			echo -e "\033[31m核心文件下载失败！\033[0m"
+			echo -e "\033[31m核心文件下载成功但校验失败！请尝试手动指定CPU版本\033[0m"
 			rm -rf /tmp/clash.new
-			error_down
+			setcpucore
 		else
 			echo -e "\033[32m$clashcore核心下载成功！\033[0m"
 			mv -f /tmp/clash.new $bindir/clash