From 9efa56e05a7651b06ddc941f8a763228e8a6cbab Mon Sep 17 00:00:00 2001
From: juewuy <juewuy@126.com>
Date: Tue, 4 Apr 2023 12:14:25 +0800
Subject: [PATCH] =?UTF-8?q?v1.7.4c=20~=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=B1=B3?=
 =?UTF-8?q?=E4=B8=87=E5=85=86=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF=E5=90=AF=E5=8A=A8=E7=9A=84bug=20~=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8C=85=E5=90=AB&=E7=AC=A6=E5=8F=B7?=
 =?UTF-8?q?=E7=9A=84=E8=AE=A2=E9=98=85=E9=93=BE=E6=8E=A5=E6=97=B6=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E7=94=9F=E6=88=90=E9=85=8D=E7=BD=AE=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20~=E5=B0=9D=E8=AF=95=E6=94=AF=E6=8C=81=E7=BA=A2?=
 =?UTF-8?q?=E7=B1=B3AX6000=E7=9A=84tun=E6=A8=A1=E5=9D=97=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=20~=E5=B0=8F=E7=B1=B3=E8=AE=BE=E5=A4=87=E8=BD=AF=E5=9B=BA?=
 =?UTF-8?q?=E5=8C=96=E5=8A=9F=E8=83=BD=E4=B8=8D=E5=86=8D=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?clash=E6=9C=8D=E5=8A=A1=E5=90=AF=E5=8A=A8=20~=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85=E8=84=9A=E6=9C=AC=E9=80=82=E9=85=8D=E5=B0=8F?=
 =?UTF-8?q?=E7=B1=B3=E4=B8=87=E5=85=86=E8=AE=BE=E5=A4=87=20~=E5=B1=8F?=
 =?UTF-8?q?=E8=94=BDntp=E5=90=8C=E6=AD=A5=E6=9C=8D=E5=8A=A1=E7=9A=84?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/getdate.sh     | 3 ++-
 scripts/init.sh        | 2 +-
 scripts/misnap_init.sh | 6 ++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/scripts/getdate.sh b/scripts/getdate.sh
index 0d054b3..0fd5863 100644
--- a/scripts/getdate.sh
+++ b/scripts/getdate.sh
@@ -133,12 +133,13 @@ getlink(){
 		echo -e " 0 \033[31m撤销输入并返回上级菜单\033[0m"
 		echo -----------------------------------------------
 		read -p "请直接输入第${i}个链接或对应数字选项 > " link
+		link=$(echo $link | sed 's/\&/%26/g')   #处理分隔符
 		test=$(echo $link | grep "://")
 		link=`echo ${link/\#*/''}`   #删除链接附带的注释内容
 		link=`echo ${link/\ \(*\)/''}`   #删除恶心的超链接内容
 		link=`echo ${link/*\&url\=/""}`   #将clash完整链接还原成单一链接
 		link=`echo ${link/\&config\=*/""}`   #将clash完整链接还原成单一链接
-		link=`echo ${link//\&/\\\&}`   #处理分隔符
+		
 		if [ -n "$test" ];then
 			if [ -z "$Url_link" ];then
 				Url_link="$link"
diff --git a/scripts/init.sh b/scripts/init.sh
index 547dc8b..ef861c8 100644
--- a/scripts/init.sh
+++ b/scripts/init.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright (C) Juewuy
 
-version=1.7.4b
+version=1.7.4c
 
 setdir(){
 	dir_avail(){
diff --git a/scripts/misnap_init.sh b/scripts/misnap_init.sh
index 3f86633..dbe66fe 100644
--- a/scripts/misnap_init.sh
+++ b/scripts/misnap_init.sh
@@ -22,13 +22,15 @@ autoSSH(){
 	[ -f $clashdir/authorized_keys ] && ln -sf $clashdir/authorized_keys /etc/dropbear/authorized_keys
 }
 tunfix(){
+	[ -d /lib/modules/4.4.198 ] && ko_dir=/lib/modules/4.4.198
+	[ -d /lib/modules/5.4.150 ] && ko_dir=/lib/modules/5.4.150
 	#在/tmp创建并挂载overlay
 	mkdir -p /tmp/overlay
 	mkdir -p /tmp/overlay/upper
 	mkdir -p /tmp/overlay/work
-	mount -o noatime,lowerdir=/lib/modules/4.4.198,upperdir=/tmp/overlay/upper,workdir=/tmp/overlay/work -t overlay "overlay_mods_only" /lib/modules/4.4.198
+	mount -o noatime,lowerdir=${ko_dir},upperdir=/tmp/overlay/upper,workdir=/tmp/overlay/work -t overlay "overlay_mods_only" ${ko_dir}
 	#将tun.ko链接到lib
-	ln -s $clashdir/tun.ko /lib/modules/4.4.198/tun.ko
+	ln -s $clashdir/tun.ko ${ko_dir}/tun.ko
 }
 init(){
 	#初始化环境变量