diff --git a/bin/Country.mmdb b/bin/Country.mmdb index 1905593..6b260cc 100644 Binary files a/bin/Country.mmdb and b/bin/Country.mmdb differ diff --git a/bin/clashdb.tar.gz b/bin/clashdb.tar.gz index 83edf4b..2e317e4 100644 Binary files a/bin/clashdb.tar.gz and b/bin/clashdb.tar.gz differ diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index 74e7d50..cae97c5 100644 Binary files a/bin/clashfm.tar.gz and b/bin/clashfm.tar.gz differ diff --git a/bin/version b/bin/version index 0ed0168..fdd4d04 100644 --- a/bin/version +++ b/bin/version @@ -1,4 +1,4 @@ clash_v=1.2.0 clashpre_v=2020.10.26 -GeoIP_v=20201031 -versionsh=1.0.0beta16.9 +GeoIP_v=20201108 +versionsh=1.0.0beta17 diff --git a/bin/yacd.tar.gz b/bin/yacd.tar.gz index 252e909..cf940b0 100644 Binary files a/bin/yacd.tar.gz and b/bin/yacd.tar.gz differ diff --git a/scripts/clash.sh b/scripts/clash.sh index 31cee70..1bb5038 100644 --- a/scripts/clash.sh +++ b/scripts/clash.sh @@ -227,14 +227,14 @@ setdns(){ [ -z "$dns_nameserver" ] && dns_nameserver='114.114.114.114, 223.5.5.5' [ -z "$dns_fallback" ] && dns_fallback='1.0.0.1, 8.8.4.4' echo ----------------------------------------------- - echo -e "当前基础DNS:\033[36m$dns_nameserver\033[0m" + echo -e "当前基础DNS:\033[32m$dns_nameserver\033[0m" echo -e "fallbackDNS:\033[36m$dns_fallback\033[0m" echo -e "多个DNS地址请用\033[30;47m | \033[0m分隔一次性输入" echo -e "\033[33m使用redir-host时,fallback组暂不支持tls或者https形式的DNS\033[0m" echo ----------------------------------------------- - echo -e " 1 修改基础DNS" - echo -e " 2 修改fallback_DNS" - echo -e " 3 重置DNS配置" + echo -e " 1 修改\033[32m基础DNS\033[0m" + echo -e " 2 修改\033[36mfallback_DNS\033[0m" + echo -e " 3 \033[33m重置\033[0mDNS配置" echo -e " 4 禁用内置DNS(慎用)" echo -e " 0 返回上级菜单" echo ----------------------------------------------- @@ -246,14 +246,14 @@ setdns(){ read -p "请输入新的DNS > " dns_nameserver dns_nameserver=$(echo $dns_nameserver | sed 's/|/\,\ /g') if [ -n "$dns_nameserver" ]; then - setconfig dns_nameserver \'$dns_nameserver\' + setconfig dns_nameserver \'"$dns_nameserver"\' echo -e "\033[32m设置成功!!!\033[0m" fi elif [ "$num" = 2 ]; then read -p "请输入新的DNS > " dns_fallback dns_fallback=$(echo $dns_fallback | sed 's/|/\,\ /g') if [ -n "$dns_fallback" ]; then - setconfig dns_fallback \'$dns_fallback\' + setconfig dns_fallback \'"$dns_fallback"\' echo -e "\033[32m设置成功!!!\033[0m" fi elif [ "$num" = 3 ]; then diff --git a/scripts/getdate.sh b/scripts/getdate.sh index 006c7ee..a9edb16 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -741,7 +741,7 @@ if [ -z "$release_new" ];then update_url=$update_url@$release_new fi webget /tmp/clashversion $update_url/bin/version echooff - [ "$result" = "200" ] && source /tmp/clashversion || echo -e "\033[31m检查更新失败!\033[0m" + [ "$result" = "200" ] && source /tmp/clashversion || echo -e "\033[31m检查更新失败!请检查网络连接或更换安装源!\033[0m" [ -z "$release_new" ] && release_new=$versionsh rm -rf /tmp/clashversion rm -rf /tmp/clashrelease