diff --git a/bin/ShellCrash.tar.gz b/bin/ShellCrash.tar.gz index 376250f..7bbe8da 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 dac48bf..6d0a312 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 6827ea0..b5574fb 100644 Binary files a/bin/public.tar.gz and b/bin/public.tar.gz differ diff --git a/bin/version b/bin/version index 3e96640..e9aff07 100644 --- a/bin/version +++ b/bin/version @@ -4,5 +4,5 @@ clash_v=v1.7.1 meta_v=v1.18.7 singboxp_v=1.10.0-alpha.29-067c81a7 singbox_v=1.9.0 -versionsh=1.9.1rc10 +versionsh=1.9.1rc11 GeoIP_v=20241116 diff --git a/scripts/init.sh b/scripts/init.sh index 9f0ebf7..adf29e1 100644 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) Juewuy -version=1.9.1rc10 +version=1.9.1rc11 setdir() { dir_avail() { diff --git a/scripts/menu.sh b/scripts/menu.sh index bb3f0ca..92995c3 100644 --- a/scripts/menu.sh +++ b/scripts/menu.sh @@ -1482,15 +1482,16 @@ fake_ip_filter() { case $input in 0) ;; '') ;; - [0-99]) - sed -i "${input}d" ${CRASHDIR}/configs/fake_ip_filter 2>/dev/null - echo -e "\033[32m移除成功!\033[0m" - fake_ip_filter - ;; *) - echo -e "你输入的地址是:\033[32m$input\033[0m" - read -p "确认添加?(1/0) > " res - [ "$res" = 1 ] && echo $input >>${CRASHDIR}/configs/fake_ip_filter + if [ $input -ge 1 ] 2>/dev/null;then + sed -i "${input}d" ${CRASHDIR}/configs/fake_ip_filter 2>/dev/null + echo -e "\033[32m移除成功!\033[0m" + else + echo -e "你输入的地址是:\033[32m$input\033[0m" + read -p "确认添加?(1/0) > " res + [ "$res" = 1 ] && echo $input >>${CRASHDIR}/configs/fake_ip_filter + fi + sleep 1 fake_ip_filter ;; esac diff --git a/scripts/start.sh b/scripts/start.sh index 01bbd15..df6388e 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -219,7 +219,7 @@ getlanip() { #获取局域网host地址 check_clash_config() { #检查clash配置文件 #检测节点或providers sed -n "/^proxies:/,/^[a-z]/ { /^[a-z]/d; p; }" "$core_config_new" >"$TMPDIR"/proxies.yaml - if ! grep -q 'server:' "$TMPDIR"/proxies.yaml && ! grep -q 'proxy-providers:' "$core_config_new"; then + if ! grep -Eq 'server:|server":' "$TMPDIR"/proxies.yaml && ! grep -q 'proxy-providers:' "$core_config_new"; then echo ----------------------------------------------- logger "获取到了配置文件【$core_config_new】,但似乎并不包含正确的节点信息!" 31 cat "$TMPDIR"/proxies.yaml