diff --git a/bin/ShellClash.tar.gz b/bin/ShellClash.tar.gz index 2bd1ab3c2..8d17ffa38 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 f649efb56..47d1e4e6f 100644 Binary files a/bin/clashfm.tar.gz and b/bin/clashfm.tar.gz differ diff --git a/bin/version b/bin/version index 99d33e4d6..0a0029c66 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.0e +versionsh=1.7.0f diff --git a/scripts/clash.sh b/scripts/clash.sh index ddcd11a21..800b648dc 100644 --- a/scripts/clash.sh +++ b/scripts/clash.sh @@ -98,11 +98,12 @@ ckstatus(){ #检查执行权限 [ ! -x $clashdir/start.sh ] && chmod +x $clashdir/start.sh #检查/tmp内核文件 - for file in `ls -F /tmp | grep -v [/\$] | grep -iE '^clash$|^clash-linux*'` ; do + for file in `ls -F /tmp | grep -v [/\$] | grep -v '\ ' | grep -iE '^clash$|^clash-linux*'` ; do + file=/tmp/$file chmod +x $file tmp_version=$($file -v 2>/dev/null) if [ -n "$tmp_version" ];then - echo -e "\033[32m发现可用的内核文件\033[0m" + echo -e "发现可用的内核文件: \033[36m$file\033[0m " read -p "是否加载?(1/0) > " res [ "$res" = 1 ] && { echo -e " 1 Clash内核" @@ -114,7 +115,7 @@ ckstatus(){ 3) clashcore=clash.meta ;; *) clashcore=clash ;; esac - mv -f $file $bindir/clash + mv -f $file $bindir/clash && echo -e "\033[32m内核加载完成!\033[0m " && sleep 1 setconfig clashcore $clashcore } else @@ -127,13 +128,21 @@ ckstatus(){ done #检查/tmp配置文件 [ -x $bindir/clash ] && \ - for file in `ls -F /tmp | grep -v [/\$] | grep -iE '.yaml$|.yml$'` ; do + for file in `ls -F /tmp | grep -v [/\$] | grep -v '\ ' | grep -iE '.yaml$|.yml$'` ; do + file=/tmp/$file $bindir/clash -t -d $bindir -f $file &>/dev/null && { - echo -e "\033[32m发现可用的YAML配置文件\033[0m" - echo $file + echo -e "发现可用的YAML配置文件: \033[36m$file\033[0m " read -p "加载为config.yaml配置文件/或者移除该文件?(1/0) > " res - [ "$res" = 1 ] && mv -f $file $clashdir/config.yaml - [ "$res" = 0 ] && rm -rf $file + [ "$res" = 1 ] && { + mv -f $file $clashdir/config.yaml + echo -e "\033[32m配置文件加载完成!\033[0m " + sleep 1 + } + [ "$res" = 0 ] && { + rm -rf $file + echo -e "\033[32m配置文件已移除!\033[0m " + sleep 1 + } echo ----------------------------------------------- } done diff --git a/scripts/init.sh b/scripts/init.sh index 75339ded2..6de790d3d 100644 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) Juewuy -version=1.7.0e +version=1.7.0f setdir(){ dir_avail(){ diff --git a/scripts/start.sh b/scripts/start.sh index 0cf246b7b..41a14973c 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -1234,7 +1234,7 @@ afstart(){ [ "$local_proxy" = "已开启" ] && [ "$local_type" = "nftables增强模式" ] && [ "$redir_mod" = "纯净模式" ] && start_nft ckcmd iptables && start_wan #同步本机时间 - ckcmd ntpd && ntpd -n -q -p ntp.aliyun.com + ckcmd ntpd && ntpd -n -q -p 203.107.6.88 #标记启动时间 mark_time #加载定时任务