diff --git a/bin/ShellClash.tar.gz b/bin/ShellClash.tar.gz index e3a202b..2bd1ab3 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 9b080c6..f649efb 100644 Binary files a/bin/clashfm.tar.gz and b/bin/clashfm.tar.gz differ diff --git a/bin/version b/bin/version index 5477f08..99d33e4 100644 --- a/bin/version +++ b/bin/version @@ -3,4 +3,4 @@ clashpre_v=2022.11.25 clash_v=v1.7.1 meta_v=v1.13.2 GeoIP_v=20230128 -versionsh=1.7.0d +versionsh=1.7.0e diff --git a/scripts/clash.sh b/scripts/clash.sh index eab6194..ddcd11a 100644 --- a/scripts/clash.sh +++ b/scripts/clash.sh @@ -98,7 +98,7 @@ ckstatus(){ #检查执行权限 [ ! -x $clashdir/start.sh ] && chmod +x $clashdir/start.sh #检查/tmp内核文件 - for file in `find /tmp -name "clash-linux*" -o -name "clash"` ; do + for file in `ls -F /tmp | grep -v [/\$] | grep -iE '^clash$|^clash-linux*'` ; do chmod +x $file tmp_version=$($file -v 2>/dev/null) if [ -n "$tmp_version" ];then @@ -127,7 +127,7 @@ ckstatus(){ done #检查/tmp配置文件 [ -x $bindir/clash ] && \ - for file in `find /tmp -name "*.yaml" -o -name "*.yml"` ; do + for file in `ls -F /tmp | grep -v [/\$] | grep -iE '.yaml$|.yml$'` ; do $bindir/clash -t -d $bindir -f $file &>/dev/null && { echo -e "\033[32m发现可用的YAML配置文件\033[0m" echo $file diff --git a/scripts/init.sh b/scripts/init.sh index eae32ab..75339de 100644 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) Juewuy -version=1.7.0d +version=1.7.0e setdir(){ dir_avail(){ diff --git a/scripts/start.sh b/scripts/start.sh index 4f076e8..0cf246b 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -1233,6 +1233,8 @@ afstart(){ [ "$local_proxy" = "已开启" ] && [ "$local_type" = "iptables增强模式" ] && start_output [ "$local_proxy" = "已开启" ] && [ "$local_type" = "nftables增强模式" ] && [ "$redir_mod" = "纯净模式" ] && start_nft ckcmd iptables && start_wan + #同步本机时间 + ckcmd ntpd && ntpd -n -q -p ntp.aliyun.com #标记启动时间 mark_time #加载定时任务