diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index f10f555..53079d6 100644 Binary files a/bin/clashfm.tar.gz and b/bin/clashfm.tar.gz differ diff --git a/bin/version b/bin/version index 60d2455..d97c137 100644 --- a/bin/version +++ b/bin/version @@ -1,2 +1,2 @@ GeoIP_v=20200908 -versionsh=1.0.0beta3 +versionsh=1.0.0beta4 diff --git a/install.sh b/install.sh index 25264dd..0d6f4b7 100644 --- a/install.sh +++ b/install.sh @@ -7,7 +7,7 @@ echo "** Clash for Miwifi **" echo "** by Juewuy **" echo "***********************************************" -url="https://cdn.jsdelivr.net/gh/juewuy/clash-for-Miwifi@latest" +url="https://cdn.jsdelivr.net/gh/juewuy/ShellClash@latest" result=$(curl -w %{http_code} -skLo /tmp/clashversion $url/bin/version) [ "$result" != "200" ] && echo "无法连接到服务器!" && exit 1 source /tmp/clashversion diff --git a/scripts/clash.sh b/scripts/clash.sh index 9129fee..d638919 100644 --- a/scripts/clash.sh +++ b/scripts/clash.sh @@ -3,7 +3,7 @@ getconfig(){ #服务器地址 -[ -z "$update_url" ] && update_url=https://cdn.jsdelivr.net/gh/juewuy/clash-for-Miwifi@latest +[ -z "$update_url" ] && update_url=https://cdn.jsdelivr.net/gh/juewuy/ShellClash@latest #文件路径 [ -z "$clashdir" ] && clashdir=$(dirname $(readlink -f "$0")) && echo "export clashdir=\"$clashdir\"" >> /etc/profile ccfg=$clashdir/mark diff --git a/scripts/getdate.sh b/scripts/getdate.sh index a1315f7..6caf759 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -525,8 +525,8 @@ result=$(curl -w %{http_code} -skLo /tmp/clashversion $update_url/bin/version) [ "$result" != "200" ] && echo "检查更新失败!" && exit 1 source /tmp/clashversion echo ----------------------------------------------- -echo -e "当前脚本版本为:\033[33m $Geo_v \033[0m" -echo -e "最新脚本版本为:\033[32m $GeoIP_v \033[0m" +echo -e "当前GeoIP版本为:\033[33m $Geo_v \033[0m" +echo -e "最新GeoIP版本为:\033[32m $GeoIP_v \033[0m" echo ----------------------------------------------- read -p "是否更新数据库文件?[1/0] > " res if [ "$res" = '1' ]; then @@ -666,13 +666,13 @@ if [ -z $num ]; then echo -e "\033[31m请输入正确的数字!\033[0m" update elif [[ $num == 1 ]]; then - update_url="https://cdn.jsdelivr.net/gh/juewuy/clash-for-Miwifi@latest" + update_url="https://cdn.jsdelivr.net/gh/juewuy/ShellClash@latest" elif [[ $num == 9 ]]; then update_url="https://juewuy.xyz/clash" elif [[ $num == 2 ]]; then - update_url="https://raw.githubusercontent.com/juewuy/clash-for-Miwifi/master" + update_url="https://raw.githubusercontent.com/juewuy/ShellClash/master" elif [[ $num == 3 ]]; then - update_url="-x 127.0.0.1:7890 https://raw.githubusercontent.com/juewuy/clash-for-Miwifi/master" + update_url="-x 127.0.0.1:7890 https://raw.githubusercontent.com/juewuy/ShellClash/master" elif [[ $num == 4 ]]; then echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ read -p "请输入个人源路径 > " update_url diff --git a/scripts/start.sh b/scripts/start.sh index f5c9fa6..c1f2d7b 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -83,7 +83,7 @@ mark_time(){ start_redir(){ #修改iptables规则使流量进入clash iptables -t nat -N clash - #iptables -t nat -A clash -d 0.0.0.0/8 -j RETURN + iptables -t nat -A clash -d 0.0.0.0/8 -j RETURN iptables -t nat -A clash -d 10.0.0.0/8 -j RETURN iptables -t nat -A clash -d 127.0.0.0/8 -j RETURN iptables -t nat -A clash -d 169.254.0.0/16 -j RETURN