diff --git a/bin/ShellCrash.tar.gz b/bin/ShellCrash.tar.gz index 5bf673e..250e6ac 100644 Binary files a/bin/ShellCrash.tar.gz and b/bin/ShellCrash.tar.gz differ diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index 222ed74..910faba 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 9b86845..05eb325 100644 Binary files a/bin/public.tar.gz and b/bin/public.tar.gz differ diff --git a/bin/version b/bin/version index 03321c5..4c6ae00 100644 --- a/bin/version +++ b/bin/version @@ -4,4 +4,4 @@ clash_v=v1.7.1 meta_v=v1.18.0 singbox_v=1.8.0 GeoIP_v=20240107 -versionsh=1.8.6b +versionsh=1.8.6c diff --git a/scripts/getdate.sh b/scripts/getdate.sh index 60a2339..6e6e984 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -1665,7 +1665,7 @@ update(){ update elif [ "$num" = 9 ]; then - $0 -u + crash -u exit elif [ "$num" = 99 ]; then @@ -1863,7 +1863,7 @@ testcommand(){ $CRASHDIR/start.sh stop if [ "$crashcore" = singbox ] ;then $BINDIR/CrashCore run -D $BINDIR -c $TMPDIR/config.json & - { sleep 2 ; kill $! &>/dev/null & } + { sleep 4 ; kill $! &>/dev/null & } wait else $BINDIR/CrashCore -t -d $BINDIR -f $TMPDIR/config.yaml diff --git a/scripts/init.sh b/scripts/init.sh index d6cbcfc..c1ec24b 100644 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) Juewuy -version=1.8.6b +version=1.8.6c setdir(){ dir_avail(){ diff --git a/scripts/start.sh b/scripts/start.sh index 25f4141..dc8ace0 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -586,7 +586,7 @@ EOF "outbound": ["any"], "server": "dns_resolver" }, { - "geosite": ["geolocation-cn"], + "geosite": ["cn"], "query_type": [ "A", "AAAA" ], "server": "$direct_dns" }, { @@ -1305,11 +1305,14 @@ stop_firewall(){ #还原防火墙配置 web_save(){ #最小化保存面板节点选择 getconfig #使用get_save获取面板节点设置 - get_save http://127.0.0.1:${db_port}/proxies | awk -F ':\\{"' '{for(i=1;i<=NF;i++) print $i}' | grep -aE '(^all|^alive)".*"Selector"' > ${TMPDIR}/shellcrash_web_check_$USER + get_save http://127.0.0.1:${db_port}/proxies | awk -F ':\\{"' '{for(i=1;i<=NF;i++) print $i}' | grep -aE '"Selector"' | grep -aoE '"name":.*"now":".*",' > ${TMPDIR}/shellcrash_web_check_$USER while read line ;do - def=$(echo $line | awk -F "[[,]" '{print $2}') - now=$(echo $line | grep -oE '"now".*",' | sed 's/"now"://g' | sed 's/"type":.*//g' | sed 's/,//g') - [ "$def" != "$now" ] && echo $line | grep -oE '"name".*"now".*",' | sed 's/"name"://g' | sed 's/"now"://g' | sed 's/"type":.*//g' | sed 's/"//g' >> ${TMPDIR}/shellcrash_web_save_$USER + def=$(echo $line | grep -oE '"all".*",' | awk -F "[:\"]" '{print $5}' ) + now=$(echo $line | grep -oE '"now".*",' | awk -F "[:\"]" '{print $5}' ) + [ "$def" != "$now" ] && { + name=$(echo $line | grep -oE '"name".*",' | awk -F "[:\"]" '{print $5}' ) + echo "${name},${now}" >> ${TMPDIR}/shellcrash_web_save_$USER + } done < ${TMPDIR}/shellcrash_web_check_$USER rm -rf ${TMPDIR}/shellcrash_web_check_$USER #对比文件,如果有变动且不为空则写入磁盘,否则清除缓存 diff --git a/scripts/task.sh b/scripts/task.sh index 7ab0977..af741db 100644 --- a/scripts/task.sh +++ b/scripts/task.sh @@ -124,7 +124,7 @@ reset_firewall(){ #重设透明路由防火墙 ${CRASHDIR}/start.sh afstart } ntp(){ - ckcmd ntpd && ntpd -n -q -p 203.107.6.88 &>/dev/null || exit 0 & + [ "$crashcore" != singbox ] && ckcmd ntpd && ntpd -n -q -p 203.107.6.88 &>/dev/null || exit 0 & } #任务工具