diff --git a/bin/ShellClash.tar.gz b/bin/ShellClash.tar.gz index 0b14568..071dba1 100644 Binary files a/bin/ShellClash.tar.gz and b/bin/ShellClash.tar.gz differ diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index 2251a8f..ed4e182 100644 Binary files a/bin/clashfm.tar.gz and b/bin/clashfm.tar.gz differ diff --git a/bin/public.tar.gz b/bin/public.tar.gz index 342d1e4..2f0984d 100644 Binary files a/bin/public.tar.gz and b/bin/public.tar.gz differ diff --git a/bin/version b/bin/version index c1e7730..f8542a4 100644 --- a/bin/version +++ b/bin/version @@ -3,4 +3,4 @@ clashpre_v=2022.11.25 clash_v=v1.7.1 meta_v=v1.15.0 GeoIP_v=20230729 -versionsh=1.7.10d +versionsh=1.7.10e diff --git a/install.sh b/install.sh index 3c9de41..8395053 100644 --- a/install.sh +++ b/install.sh @@ -2,8 +2,11 @@ # Copyright (C) Juewuy type bash &>/dev/null && shtype=bash || shtype=sh -echo='echo -e' && [ -n "$(echo -e|grep e)" ] && echo=echo - +echo='echo -e' +[ -n "$(echo -e|grep e)" ] && { + echo "\033[31m不支持dash环境安装!请先输入bash命令后再运行安装命令!\033[0m" + exit +} echo "***********************************************" echo "** 欢迎使用 **" echo "** ShellClash **" diff --git a/scripts/clash.sh b/scripts/clash.sh index c632e74..9780d17 100644 --- a/scripts/clash.sh +++ b/scripts/clash.sh @@ -182,15 +182,15 @@ startover(){ } clashstart(){ #检查yaml配置文件 - if [ ! -f $clashdir/yamls/config.yaml ];then - echo ----------------------------------------------- + echo ----------------------------------------------- + if [ -s $clashdir/yamls/config.yaml -o -n "$Url" -o -n "$Https" ];then + $clashdir/start.sh start + sleep 1 + [ -n "$(pidof clash)" ] && startover + else echo -e "\033[31m没有找到配置文件,请先导入配置文件!\033[0m" source $clashdir/getdate.sh && clashlink fi - echo ----------------------------------------------- - $clashdir/start.sh start - sleep 1 - [ -n "$(pidof clash)" ] && startover } checkrestart(){ echo ----------------------------------------------- @@ -1663,10 +1663,10 @@ tools(){ fi tools elif [ "$num" = 8 ]; then - if [ -f $clashdir/configs/tun.ko ];then + if [ -f $clashdir/tools/tun.ko ];then read -p "是否禁用此功能并移除相关补丁?(1/0) > " res [ "$res" = 1 ] && { - rm -rf $clashdir/configs/tun.ko + rm -rf $clashdir/tools/tun.ko echo -e "\033[33m补丁文件已移除,请立即重启设备以防止出错!\033[0m" } elif [ -z "$(modinfo tun)" ];then @@ -1680,7 +1680,7 @@ tools(){ echo 正在连接服务器获取Tun模块补丁文件………… $clashdir/start.sh webget $TMPDIR/tun.ko $tunfixlink if [ "$?" = "0" ];then - mv -f $TMPDIR/tun.ko $clashdir && \ + mv -f $TMPDIR/tun.ko $clashdir/tools/tun.ko && \ $clashdir/misnap_init.sh tunfix && \ echo -e "\033[32m设置成功!请重启clash服务!\033[0m" else diff --git a/scripts/init.sh b/scripts/init.sh index 1dd719e..0c24f2b 100644 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) Juewuy -version=1.7.10d +version=1.7.10e setdir(){ dir_avail(){ @@ -233,9 +233,10 @@ rm -rf /tmp/SC_tmp #转换&清理旧版本文件 mkdir -p $clashdir/yamls mkdir -p $clashdir/tools -for file in config.yaml config.yaml.bak user.yaml proxies.yaml proxy-groups.yaml rules.yaml others.yaml ;do +for file in config.yaml.bak user.yaml proxies.yaml proxy-groups.yaml rules.yaml others.yaml ;do mv -f $clashdir/$file $clashdir/yamls/$file 2>/dev/null done + [ ! -L $clashdir/config.yaml ] && mv -f $clashdir/config.yaml $clashdir/yamls/config.yaml 2>/dev/null for file in fake_ip_filter mac web_save servers.list fake_ip_filter.list fallback_filter.list;do mv -f $clashdir/$file $clashdir/configs/$file 2>/dev/null done