From ebd1e10c03a74eb42ae338f3584265865b1aaf20 Mon Sep 17 00:00:00 2001 From: juewuy Date: Tue, 11 Aug 2020 10:17:00 +0800 Subject: [PATCH] =?UTF-8?q?v0.8.7=20~=E4=BF=AE=E5=A4=8D=E4=BA=86=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E6=9B=B4=E6=96=B0=E8=B7=AF=E5=BE=84=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E7=9A=84bug=20~=E8=B0=83=E6=95=B4=E4=BA=86geoip?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=8B=E8=BD=BD=E6=BA=90=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=20~=E5=A2=9E=E5=8A=A0=E4=BA=86=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E6=BA=90=E8=BE=93=E5=85=A5=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/clashfm.tar.gz | Bin 10517 -> 10567 bytes bin/version | 2 +- scripts/clash.sh | 4 ++-- scripts/getdate.sh | 13 +++++++++---- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index e7f336afd8c5ca2e4cb85993eab1259d70554336..cd0a2a8e45d7feee0ef99bed6d9fa0e48013e786 100644 GIT binary patch delta 10445 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 DUU`0@I@-pZC?DW`?tN_+u_~j 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 diff --git a/bin/version b/bin/version index 82a5ecf..6e57b6e 100644 --- a/bin/version +++ b/bin/version @@ -1 +1 @@ -versionsh=0.8.6 +versionsh=0.8.7 diff --git a/scripts/clash.sh b/scripts/clash.sh index 950e5ee..1ad1224 100644 --- a/scripts/clash.sh +++ b/scripts/clash.sh @@ -3,9 +3,9 @@ getconfig(){ #版本号 -versionsh_l=0.8.6 +versionsh_l=0.8.7 #服务器地址 -if [ ! -n "$update_url" ]; then +if [ ! -n "$update_url" ] && [ ! -z "$update_url" ]; then update_url=https://cdn.jsdelivr.net/gh/juewuy/clash-for-Miwifi/ fi #文件路径 diff --git a/scripts/getdate.sh b/scripts/getdate.sh index 8c9ab9a..d061cd8 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -241,7 +241,7 @@ if [ "$res" = '1' ]; then echo ----------------------------------------------- echo 开始解压文件! mkdir -p $clashdir > /dev/null - tar -zxvf '/tmp/clashfm.tar.gz' -C $clashdir > /dev/null + tar -zxvf '/tmp/clashfm.tar.gz' -C $clashdir/ > /dev/null [ $? -ne 0 ] && echo "文件解压失败!" && exit 1 #初始化文件目录 mv $clashdir/clashservice /etc/init.d/clash #将clash服务文件移动到系统目录 @@ -356,7 +356,7 @@ echo -e "\033[30;46m感谢Alecthw大神提供的优质GeoIP数据库!!!\03 echo ----------------------------------------------- echo -e "\033[33m请选择下载源:\033[0m" echo -e " 1 默认源:$update_url" -echo -e " 2 Alecthw大神提供的服务器" +echo -e " 2 Alecthw大神的Github(需开启clash服务)" echo -e " 0 返回上级菜单" read -p "请输入对应数字 > " num if [ -z $num ]; then @@ -369,7 +369,7 @@ read -p "请输入对应数字 > " num geolink="$update_url/bin/Country.mmdb" #echo $geolink elif [[ $num == 2 ]]; then - geolink="http://www.ideame.top/mmdb/Country.mmdb" + geolink="-x 127.0.0.1:7890 https://raw.githubusercontent.com/alecthw/mmdb_china_ip_list/release/Country.mmdb" else echo -e "\033[31m请输入正确的数字!\033[0m" update @@ -446,7 +446,7 @@ echo ----------------------------------------------- echo -e " 1 CDN源(感谢\033[4;32mwww.jsdelivr.com\033[0m,推荐)" echo -e " 2 Github源(不稳定,不推荐)" echo -e " 3 Github源+clash代理(需开启clash服务,推荐)" -echo -e " 4 自定义输入" +echo -e " 4 自定义输入(请务必确保路径正确)" echo -e " 0 返回上级菜单" read -p "请输入对应数字 > " num if [ -z $num ]; then @@ -464,6 +464,11 @@ elif [[ $num == 3 ]]; then elif [[ $num == 4 ]]; then echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ read -p "请输入个人源路径 > " update_url + if [ -n $update_url ];then + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + echo -e "\033[31m取消输入,返回上级菜单!\033[0m" + update + fi else echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m请输入正确的数字!\033[0m"