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(){ #初始化环境变量