From 31865ff734665b01f366b14f8ca86cdce6eabe63 Mon Sep 17 00:00:00 2001 From: juewuy Date: Mon, 10 Aug 2020 20:24:28 +0800 Subject: [PATCH] =?UTF-8?q?v0.8.6=20~=E6=96=B0=E5=A2=9ECDN=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E6=BA=90=E5=92=8CGithub=E4=B8=8B=E8=BD=BD=E6=BA=90?= =?UTF-8?q?=EF=BC=8C=E4=B8=8B=E8=BD=BD=E6=9B=B4=E6=96=B0=E9=80=9F=E5=BA=A6?= =?UTF-8?q?=E6=9B=B4=E5=BF=AB=20~=E6=96=B0=E5=A2=9E=E4=BA=86=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E4=B8=8B=E8=BD=BD=E6=BA=90=E7=9A=84=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=20~=E7=95=8C=E9=9D=A2UI=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=8F=8Abug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/clashfm.tar.gz | Bin 10065 -> 10518 bytes bin/version | 2 +- install.sh | 20 +++--- scripts/clash.sh | 172 ++++++++++++++++++++++++--------------------- scripts/getdate.sh | 153 ++++++++++++++++++++++++++-------------- 5 files changed, 200 insertions(+), 147 deletions(-) diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index 4268af80681e1dcfc30a073765eb359f5c4e30e1..ddf86873113490e978c9eb40f7e7d7323522d640 100644 GIT binary patch literal 10518 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 diff --git a/bin/version b/bin/version index 10c8868..82a5ecf 100644 --- a/bin/version +++ b/bin/version @@ -1 +1 @@ -versionsh=0.8.5 +versionsh=0.8.6 diff --git a/install.sh b/install.sh index 8d875a7..162ac08 100644 --- a/install.sh +++ b/install.sh @@ -11,17 +11,17 @@ url="https://juewuy.xyz/clash" result=$(curl -w %{http_code} -skLo /tmp/clashversion $url/bin/version) [ "$result" != "200" ] && echo "无法连接到服务器!" && exit 1 source /tmp/clashversion -echo ----------------------------------------------- +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "~~~~版本:\033[32m$versionsh\033[0m" -echo ----------------------------------------------- +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[44m使用中如遇问题请加TG群反馈:\033[42;30m t.me/clashfm \033[0m" echo -e "\033[37m目前仅支持小米AX系列3款路由器" echo -e "\033[44m其余型号可到TG群报名参与测试\033[0m" -echo ----------------------------------------------- +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[32m 1 在默认目录(/etc)安装Clash for Miwifi" echo -e "\033[33m 2 手动设置安装目录(不明勿用!)" echo -e "\033[0m 0 退出安装" -echo ----------------------------------------------- +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ read -p "请输入相应数字 > " num if [ -z $num ];then @@ -30,7 +30,7 @@ if [ -z $num ];then elif [[ $num == 1 ]];then dir=/etc elif [[ $num == 2 ]];then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo '可用路径 剩余空间:' df -h | awk '{print $6,$2}'| sed 1d echo '路径是必须带 / 的格式,写入虚拟内存(/tmp,/sys,..)的文件会在重启后消失!!!' @@ -44,9 +44,9 @@ else exit; fi #下载文件包 -echo ----------------------------------------------- +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo 开始从服务器获取安装文件! -echo ----------------------------------------------- +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ tarurl=$url/bin/clashfm.tar.gz if command -v curl &> /dev/null; then result=$(curl -w %{http_code} -kLo /tmp/clashfm.tar.gz $tarurl) @@ -56,7 +56,7 @@ else $result fi [ "$result" != "200" ] && echo "文件下载失败!" && exit 1 #解压 -echo ----------------------------------------------- +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo 开始解压文件! mkdir -p $dir/clash > /dev/null tar -zxvf '/tmp/clashfm.tar.gz' -C $dir/clash/ > /dev/null @@ -80,8 +80,8 @@ echo "export clashdir=\"$dir/clash\"" >> /etc/profile #设置clash路径环境 #删除临时文件 rm -rf /tmp/clashfm.tar.gz #提示 -echo ----------------------------------------------- +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo clash for Miwifi 已经安装成功! echo -e "\033[33m直接输入\033[30;47m clash \033[0;33m命令即可管理!!!\033[0m" -echo ----------------------------------------------- +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/scripts/clash.sh b/scripts/clash.sh index eb11c92..950e5ee 100644 --- a/scripts/clash.sh +++ b/scripts/clash.sh @@ -1,17 +1,13 @@ #!/bin/sh # Copyright (C) Juewuy -echo "***********************************************" -echo "** 欢迎使用 **" -echo "** Clash for Miwifi **" -echo "** by Juewuy **" -echo "***********************************************" - getconfig(){ #版本号 -versionsh_l=0.8.5 -#更新服务器地址 -update_url="https://juewuy.xyz/clash" +versionsh_l=0.8.6 +#服务器地址 +if [ ! -n "$update_url" ]; then + update_url=https://cdn.jsdelivr.net/gh/juewuy/clash-for-Miwifi/ +fi #文件路径 if [ -z $clashdir ];then clashdir=$(dirname $(readlink -f "$0")) @@ -61,21 +57,25 @@ else run="\033[31m没有运行($redir_mod)\033[0m" fi #输出状态 -echo ----------------------------------------------- + +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +echo -e "\033[30;46m欢迎使用Clash for Miwifi!\033[0m" echo -e "Clash服务"$run","$auto"" if [ $status -gt 0 ];then echo -e "当前内存占用:\033[44m"$VmRSS"\033[0m,已运行:\033[46;30m"$day"\033[44;37m"$time"\033[0m" fi +echo -e "我的博客:\033[36;4mjuewuy.xyz\033[0m,交流反馈群:\033[36;4mt.me/clashfm\033[0m" +echo ----------------------------------------------- #安装clash核心 if [ ! -f $clashdir/clash ];then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m没有找到核心文件,请先下载clash核心!\033[0m" source $clashdir/getdate.sh getcore fi #安装GeoIP数据库 if [ ! -f $clashdir/Country.mmdb ];then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m没有找到GeoIP数据库文件,请先下载数据库!\033[0m" source $clashdir/getdate.sh getgeo @@ -88,13 +88,13 @@ sleep 1 status=`ps |grep -w 'clash -d'|grep -v grep|wc -l` if [[ $status -gt 0 ]];then host=$(ubus call network.interface.lan status | grep \"address\" | grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}';) - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[32mclash服务已启动!\033[0m" echo -e "可以使用\033[30;47m http://clash.razord.top \033[0m管理内置规则" echo -e "也可以前往更新菜单安装本地Dashboard面板,连接更稳定!!!" echo -e "Host地址:\033[36m $host \033[0m 端口:\033[36m 9999 \033[0m" else - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31mclash服务启动失败!请检查配置文件!\033[0m" fi } @@ -111,9 +111,9 @@ if [ ! -n "$server_link" ]; then sed -i "5i\server_link=1" $ccfg server_link=1 fi +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +echo -e "\033[30;47m 欢迎使用订阅功能!\033[0m" echo ----------------------------------------------- -echo -e "\033[44m 实验性功能,遇问题请加TG群反馈:\033[42;30m t.me/clashfm \033[0m" -echo -e "\033[32m 欢迎使用订阅功能!\033[0m" echo -e " 1 输入\033[36m节点/订阅\033[0m链接" echo -e " 2 输入完整clash规则链接" echo -e " 3 选取\033[33m代理规则\033[0m模版" @@ -124,19 +124,19 @@ echo -e " 7 设置自动更新(未完成)" echo -e " 0 返回上级菜单" read -p "请输入对应数字 > " num if [ -z $num ];then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m请输入正确的数字!\033[0m" clashsh elif [[ $num == 1 ]];then if [ -n "$Url" ];then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[33m检测到已记录的订阅链接:\033[0m" echo -e "\033[4;32m$Url\033[0m" - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ read -p "清空链接/追加导入?[1/0] > " res if [ "$res" = '1' ]; then Url="" - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m链接已清空!\033[0m" fi fi @@ -145,21 +145,21 @@ elif [[ $num == 1 ]];then elif [[ $num == 2 ]];then if [ -n "$Url" ];then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[33m检测到已记录的订阅链接:\033[0m" echo -e "\033[4;32m$Url\033[0m" - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ read -p "清空链接/追加导入?[1/0] > " res if [ "$res" = '1' ]; then Url="" - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m链接已清空!\033[0m" fi fi source $clashdir/getdate.sh getlink2 elif [[ $num == 3 ]];then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[44m 实验性功能,遇问题请加TG群反馈:\033[42;30m t.me/clashfm \033[0m" echo 当前使用规则为:$rule_link echo 1 ACL4SSR默认通用版(推荐) @@ -170,7 +170,7 @@ elif [[ $num == 3 ]];then echo 0 返回上级菜单 read -p "请输入对应数字 > " num if [ -z $num ];then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m请输入正确的数字!\033[0m" clashlink else @@ -178,12 +178,12 @@ elif [[ $num == 3 ]];then sed -i '/rule_link*/'d $ccfg sed -i "4i\rule_link="$num"" $ccfg rule_link=$num - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[32m设置成功!返回上级菜单!\033[0m" clashlink fi elif [[ $num == 4 ]];then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[44m 实验性功能,遇问题请加TG群反馈:\033[42;30m t.me/clashfm \033[0m" echo 当前使用后端为:$server_link echo 1 subconverter-web.now.sh @@ -196,7 +196,7 @@ elif [[ $num == 4 ]];then echo 0 返回上级菜单 read -p "请输入对应数字 > " num if [ -z $num ];then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m请输入正确的数字!\033[0m" clashlink else @@ -207,40 +207,40 @@ elif [[ $num == 4 ]];then sed -i '/server_link*/'d $ccfg sed -i "4i\server_link="$num"" $ccfg server_link=$num - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[32m设置成功!返回上级菜单!\033[0m" clashlink fi elif [[ $num == 5 ]];then yamlbak=$yaml.bak if [ ! -f "$yaml".bak ];then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m没有找到配置文件的备份!\033[0m" else - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e 备份文件共有"\033[32m`wc -l < $yamlbak`\033[0m"行内容,当前文件共有"\033[32m`wc -l < $yaml`\033[0m"行内容 read -p "确认还原配置文件?此操作不可逆![1/0] > " res if [ "$res" = '1' ]; then mv $yamlbak $yaml - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[32m配置文件已还原!请手动重启clash服务!\033[0m" else - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m操作已取消!返回上级菜单!\033[0m" fi fi clashsh elif [[ $num == 6 ]];then if [ ! -n "$Url" ];then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo 没有找到你的订阅链接!请先输入链接! clashlink else - echo ----------------------------------------------- - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[33m当前系统记录的订阅链接为:\033[0m" echo -e "\033[4;32m$Url\033[0m" - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ read -p "确认更新配置文件?[1/0] > " res if [ "$res" = '1' ]; then source $clashdir/getdate.sh @@ -251,7 +251,7 @@ elif [[ $num == 6 ]];then elif [[ $num == 0 ]];then clashsh else - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m请输入正确的数字!\033[0m" exit; fi @@ -274,9 +274,10 @@ if [ ! -n "$ipv6_support" ]; then ipv6_support=未开启 fi # +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +echo -e "\033[30;47m欢迎使用高级模式菜单:\033[0m" +echo -e "\033[33m修改配置后请手动重启clash服务!\033[0m" echo ----------------------------------------------- -echo -e "\033[33m欢迎使用高级模式菜单:\033[0m" -echo -e "\033[32m修改配置后请手动重启clash服务!\033[0m" echo -e " 1 切换Clash运行模式: \033[36m$redir_mod\033[0m" echo -e " 2 切换DNS运行模式: \033[36m$dns_mod\033[0m" echo -e " 3 跳过本地证书验证: \033[36m$skip_cert\033[0m ————解决节点证书验证错误" @@ -290,10 +291,11 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then if [[ $num == 0 ]]; then clashsh elif [[ $num == 1 ]]; then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "当前代理模式为:\033[47;30m $redir_mod \033[0m;Clash核心为:\033[47;30m $clashcore \033[0m" echo -e "\033[33m切换模式后需要手动重启clash服务以生效!\033[0m" echo -e "\033[36mTun及混合模式必须使用clashpre核心!\033[0m" + echo ----------------------------------------------- echo " 1 Redir模式:CPU以及内存占用较低" echo " 但不支持UDP流量转发" echo " 日常使用推荐此模式" @@ -306,7 +308,7 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then echo " 0 返回上级菜单" read -p "请输入对应数字 > " num if [ -z $num ]; then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m请输入正确的数字!\033[0m" clashadv elif [[ $num == 0 ]]; then @@ -315,7 +317,7 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then redir_mod=Redir模式 elif [[ $num == 2 ]]; then if [ "$clashcore" = "clash" ] || [ "$clashcore" = "clashr" ];then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m当前核心不支持开启Tun模式!请先切换clash核心!!!\033[0m" clashadv fi @@ -323,13 +325,13 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then dns_mod=fake-ip elif [[ $num == 3 ]]; then if [ "$clashcore" = "clash" ] || [ "$clashcore" = "clashr" ];then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m当前核心不支持开启Tun模式!请先切换clash核心!!!\033[0m" clashadv fi redir_mod=混合模式 else - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m请输入正确的数字!\033[0m" clashadv fi @@ -337,14 +339,15 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then sed -i "1i\redir_mod=$redir_mod" $ccfg sed -i '/dns_mod*/'d $ccfg sed -i "1i\dns_mod=$dns_mod" $ccfg - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[36m已设为 $redir_mod !!\033[0m" clashadv elif [[ $num == 2 ]]; then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "当前DNS运行模式为:\033[47;30m $dns_mod \033[0m" echo -e "\033[33m切换模式后需要手动重启clash服务以生效!\033[0m" + echo ----------------------------------------------- echo " 1 fake-ip模式: 响应速度更快" echo " 但可能和部分软件有冲突" echo " 2 redir_host模式:使用稳定,兼容性好" @@ -352,7 +355,7 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then echo " 0 返回上级菜单" read -p "请输入对应数字 > " num if [ -z $num ]; then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m请输入正确的数字!\033[0m" clashadv elif [[ $num == 0 ]]; then @@ -363,7 +366,7 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then dns_mod=redir_host redir_mod=Redir模式 else - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m请输入正确的数字!\033[0m" clashadv fi @@ -371,13 +374,13 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then sed -i "1i\dns_mod=$dns_mod" $ccfg sed -i '/redir_mod*/'d $ccfg sed -i "1i\redir_mod=$redir_mod" $ccfg - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[36m已设为 $dns_mod 模式!!\033[0m" clashadv elif [[ $num == 3 ]]; then sed -i '/skip_cert*/'d $ccfg - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ if [ "$skip_cert" = "未开启" ] > /dev/null 2>&1; then sed -i "1i\skip_cert=已开启" $ccfg echo -e "\033[33m已设为开启跳过本地证书验证!!\033[0m" @@ -392,7 +395,7 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then elif [[ $num == 4 ]]; then sed -i '/common_ports*/'d $ccfg - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ if [ "$common_ports" = "未开启" ] > /dev/null 2>&1; then sed -i "1i\common_ports=已开启" $ccfg echo -e "\033[33m已设为仅代理(22,53,587,465,995,993,143,80,443)等常用端口!!\033[0m" @@ -407,7 +410,7 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then elif [[ $num == 5 ]]; then sed -i '/modify_yaml*/'d $ccfg - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ if [ "$modify_yaml" = "未开启" ] > /dev/null 2>&1; then sed -i "1i\modify_yaml=已开启" $ccfg echo -e "\033[33m已设为使用用户完成自定义配置文件!!" @@ -424,7 +427,7 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then elif [[ $num == 6 ]]; then sed -i '/ipv6_support*/'d $ccfg - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ if [ "$ipv6_support" = "未开启" ] > /dev/null 2>&1; then sed -i "1i\ipv6_support=已开启" $ccfg echo -e "\033[33m已开启对ipv6协议的支持!!\033[0m" @@ -440,7 +443,7 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then elif [[ $num == 9 ]]; then if [ $status -gt 0 ];then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /etc/init.d/clash stop echo -e "\033[31mClash服务已停止!\033[0m" fi @@ -451,16 +454,15 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then clashadv fi else - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m请输入正确的数字!\033[0m" clashsh fi exit; } update(){ -echo ----------------------------------------------- -echo -e "\033[33m欢迎使用更新功能:\033[0m" -echo ----------------------------------------------- +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +echo -e "\033[30;47m欢迎使用更新功能:\033[0m" echo -e "感谢:\033[32mClash \033[0m作者\033[36m Dreamacro\033[0m 项目地址:\033[32mhttps://github.com/Dreamacro/clash\033[0m" echo -e "感谢:\033[32mClashR \033[0m作者\033[36m BROBIRD\033[0m 项目地址:\033[32mhttps://github.com/BROBIRD/clash\033[0m" echo -e "感谢:\033[32m更多的帮助过我的人!\033[0m" @@ -469,6 +471,7 @@ echo -e " 1 更新\033[36m管理脚本\033[0m" echo -e " 2 切换\033[33mclash核心\033[0m" echo -e " 3 更新\033[32mGeoIP数据库\033[0m" echo -e " 4 安装本地\033[35mDashboard\033[0m面板" +echo -e " 8 切换\033[36m安装源\033[0m地址" echo -e " 9 \033[31m卸载\033[34mClash for Miwfi\033[0m" echo -e " 0 返回上级菜单" read -p "请输入对应数字 > " num @@ -491,7 +494,11 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then elif [[ $num == 4 ]]; then source $clashdir/getdate.sh getdb - + + elif [[ $num == 8 ]]; then + source $clashdir/getdate.sh + setserver + elif [[ $num == 9 ]]; then read -p "确认卸载clash?(警告:该操作不可逆!)[1/0] " res if [ "$res" = '1' ]; then @@ -505,13 +512,14 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then sed -i '/export clashdir=*/'d /etc/profile echo 已卸载clash相关文件! fi + echo -e "\033[31m操作已取消!\033[0m" exit; else echo -e "\033[31m暂未支持的选项!\033[0m" update fi else - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m请输入正确的数字!\033[0m" clashsh fi @@ -537,12 +545,12 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then elif [[ $num == 1 ]]; then if [ ! -f "$yaml" ];then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m没有找到配置文件,请先导入节点/订阅链接!\033[0m" clashlink fi if [ $status -gt 0 ];then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /etc/init.d/clash stop > /dev/null 2>&1 echo -e "\033[31mClash服务已停止!\033[0m" fi @@ -554,13 +562,13 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then elif [[ $num == 3 ]]; then /etc/init.d/clash stop > /dev/null 2>&1 - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31mClash服务已停止!\033[0m" - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ exit; elif [[ $num == 4 ]]; then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ if [ -f /etc/rc.d/*clash ]; then /etc/init.d/clash disable echo -e "\033[33m已禁止Clash开机启动!\033[0m" @@ -571,7 +579,7 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then clashsh elif [[ $num == 5 ]]; then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m正在施工中,敬请期待!\033[0m" echo -e "\033[32m正在施工中,敬请期待!\033[0m" echo -e "\033[33m正在施工中,敬请期待!\033[0m" @@ -584,8 +592,8 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then clashlink elif [[ $num == 8 ]]; then - echo ----------------------------------------------- - echo -e "\033[36m这里是测试命令菜单\033[0m" + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + echo -e "\033[30;47m这里是测试命令菜单\033[0m" echo -e "\033[33m如遇问题尽量运行相应命令后截图发群\033[0m" echo ----------------------------------------------- echo " 1 查看clash运行时的报错信息" @@ -597,7 +605,7 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then echo " 0 返回上级目录!" read -p "请输入对应数字 > " num if [ -z $num ]; then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m请输入正确的数字!\033[0m" clashsh elif [[ $num == 0 ]]; then @@ -609,30 +617,30 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then echo -e "\033[31m如有报错请截图后到TG群询问!!!\033[0m" exit; elif [[ $num == 2 ]]; then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ netstat -ntulp |grep 53 - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ exit; elif [[ $num == 3 ]]; then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ openssl speed -multi 4 -evp aes-128-gcm - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ exit; elif [[ $num == 4 ]]; then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ iptables -t nat -L PREROUTING --line-numbers - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ exit; elif [[ $num == 5 ]]; then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sed -n '1,40p' $yaml - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ exit; elif [[ $num == 6 ]]; then echo 注意:测试结果不保证一定准确! delay=`curl -kx 127.0.0.1:7890 -o /dev/null -s -w '%{time_starttransfer}' 'https://google.tw' & { sleep 3 ; kill $! & }` > /dev/null 2>&1 delay=`echo |awk "{print $delay*1000}"` > /dev/null 2>&1 - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ if [ `echo ${#delay}` -gt 1 ];then echo -e "\033[32m连接成功!响应时间为:"$delay" ms\033[0m" else @@ -640,7 +648,7 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then fi clashsh else - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m请输入正确的数字!\033[0m" clashsh fi @@ -649,12 +657,12 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then update else - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m请输入正确的数字!\033[0m" fi exit 1 else - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m请输入正确的数字!\033[0m" fi exit 1 diff --git a/scripts/getdate.sh b/scripts/getdate.sh index 658da68..741e338 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -26,23 +26,23 @@ if [ -z $Https ];then markhttp=1 fi # -echo ----------------------------------------------- +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo 正在连接服务器获取配置文件…………链接地址为: echo -e "\033[4;32m$Https\033[0m" echo 可以手动复制该链接到浏览器打开并查看数据是否正常! -echo -e "\033[36m-----------------------------------------------" +echo -e "\033[36m~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" echo -e "| |" echo -e "| 需要一点时间,请耐心等待! |" echo -e "| \033[0m如长时间没有数据请用ctrl+c退出\033[36m |" -echo -e "-----------------------------------------------\033[0m" +echo -e "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\033[0m" #获取在线yaml文件 yamlnew=$yaml.new rm -rf $yamlnew > /dev/null 2>&1 result=$(curl -w %{http_code} -kLo $yamlnew $Https) if [ "$result" != "200" ];then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m配置文件获取失败!\033[0m" - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo if [ -z $markhttp ];then exit; @@ -73,7 +73,7 @@ else sleep 1 status=`ps |grep -w 'clash -d'|grep -v grep|wc -l` if [[ $status -gt 0 ]];then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[32mclash服务已启动!\033[0m" echo -e "可以使用\033[30;47m http://clash.razord.top \033[0m管理clash内置规则" host=$(ubus call network.interface.lan status | grep \"address\" | grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}';) @@ -83,7 +83,7 @@ else sed -i "7i\Https=\'$Https\'" $ccfg clashsh else - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ if [ -f $yaml.bak ];then echo -e "\033[31mclash服务启动失败!已还原配置文件并重启clash!\033[0m" mv $yaml.bak $yaml @@ -95,13 +95,13 @@ else fi fi else - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[33m获取到了配置文件,但格式似乎不对!\033[0m" echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sed -n '1,20p' $yamlnew echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[33m请检查如上配置文件信息:\033[0m" - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ fi exit; fi @@ -110,17 +110,18 @@ exit getlink(){ #设置输入循环 i=1 -while [ $i -le 9 ] +while [ $i -le 99 ] do + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + echo -e "\033[44m 遇问题请加TG群反馈:\033[42;30m t.me/clashfm \033[0m" echo ----------------------------------------------- - echo -e "\033[44m 实验性功能,遇问题请加TG群反馈:\033[42;30m t.me/clashfm \033[0m" + echo -e "支持批量导入\033[30;46m Http/Https/Clash \033[0m等格式的订阅链接" + echo -e "支持批量导入\033[30;42m Vmess/SSR/SS/Trojan/Sock5 \033[0m等格式的节点链接" + echo -e "\033[31m使用SSR节点请务必使用支持SSR的clash核心!\033[0m" + echo -e "多个较短的链接可以用\033[30;47m | \033[0m分隔以一次性输入" + echo -e "多个较长的链接请尽量分多次输入,可支持多达\033[30;47m 99 \033[0;36m次输入" + echo -e "\033[32m直接输入回车以结束输入并开始导入链接!\033[0m" echo ----------------------------------------------- - echo -e "\033[33m支持批量导入\033[30;46m Http/Https/Clash \033[0;33m等格式的订阅链接" - echo -e "支持批量导入\033[30;42m Vmess/SSR/SS/Trojan/Sock5 \033[0;33m等格式的节点链接" - echo -e "\033[36m多个较短的链接可以用\033[30;47m | \033[0;36m分隔以一次性输入" - echo -e "多个较长的链接请尽量分多次输入,可支持多达\033[30;47m 9 \033[0;36m次输入" - echo -e "\033[31;47m注意SSR/SS不支持:\033[30;47mchacha20加密 \033[0m" - echo -e "\033[44;37m直接输入回车以结束输入并开始导入链接!\033[0m" echo -e "\033[33m 0 返回上级目录!\033[0m" echo ----------------------------------------------- read -p "请输入第"$i"个链接 > " url @@ -138,7 +139,7 @@ do i=$(($i+1)) elif [ -z $url ];then if [ -n $Url ];then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e 请检查输入的链接是否正确: echo -e "\033[4m$Url\033[0m" read -p "确认导入配置文件?原配置文件将被更名为config.yaml.bak![1/0] > " res @@ -155,12 +156,12 @@ do elif [[ $url == 0 ]];then clashlink else - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m请输入正确的订阅/分享链接!!!\033[0m" fi done #### -echo ----------------------------------------------- +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo 输入太多啦,可能会导致订阅失败! echo "多个较短的链接请尽量用“|”分隔以一次性输入!" echo -e "请检查输入的链接是否正确:\033[4m$Url\033[0m" @@ -173,19 +174,20 @@ if [ "$res" = '1' ]; then #获取在线yaml文件 getyaml else - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo 操作已取消!返回上级菜单! clashlink fi clashlink } getlink2(){ -echo ----------------------------------------------- -echo -e "\033[44m 实验性功能,遇问题请加TG群反馈:\033[42;30m t.me/clashfm \033[0m" +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +echo -e "\033[44m 遇问题请加TG群反馈:\033[42;30m t.me/clashfm \033[0m" echo ----------------------------------------------- echo -e "\033[33m仅支持导入可直接在clash中使用的完整订阅链接" echo -e "\033[36m非完整链接请使用【导入节点/订阅链接】功能" echo -e "\033[31m注意如节点使用了chacha20加密协议,需将核心更新为clashr核心\033[0m" +echo ----------------------------------------------- echo -e "\033[33m0 返回上级目录!\033[0m" echo ----------------------------------------------- read -p "请输入完整链接 > " Https @@ -194,7 +196,7 @@ Https=`echo ${Https/\ \(*\)/''}` #删除恶心的超链接内容 #Https=`echo ${Https//\&/\%26}` #将分隔符 & 替换成Httpscode:%26 if [ -n $Https ];then if [ -n $test ];then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e 请检查输入的链接是否正确: echo -e "\033[4m$Https\033[0m" read -p "确认导入配置文件?原配置文件将被更名为config.yaml.bak![1/0] > " res @@ -211,12 +213,12 @@ if [ -n $Https ];then elif [[ $Https == 0 ]];then clashlink else - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m请输入正确的链接地址!!!\033[0m" fi } getsh(){ -echo ----------------------------------------------- +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[33m正在检查更新!\033[0m" result=$(curl -w %{http_code} -skLo /tmp/clashversion $update_url/bin/version) [ "$result" != "200" ] && echo "检查更新失败!" && exit 1 @@ -268,10 +270,10 @@ fi cpucore=armv7 clashcore_n=$clashcore -echo ----------------------------------------------- +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "当前clash核心:\033[47;30m $clashcore \033[46;30m$clashv\033[0m" echo -e "\033[32m请选择需要下载的核心版本!\033[0m" -echo +echo ----------------------------------------------- echo "1 clash: 运行稳定,内存占用小" echo "(官方正式版) 不支持SSR,不支持Tun模式" echo @@ -280,11 +282,11 @@ echo "(clashR修改版)不支持Tun模式" echo echo "3 clashpre: 支持SSR,支持Tun模式" echo "(高级预览版) 内存占用高,不支持chacha20加密" -echo +echo ----------------------------------------------- echo 0 返回上级菜单 read -p "请输入对应数字 > " num if [ -z $num ]; then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m请输入正确的数字!\033[0m" update elif [[ $num == 0 ]]; then @@ -296,7 +298,7 @@ read -p "请输入对应数字 > " num elif [[ $num == 3 ]]; then clashcore=clashpre else - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m请输入正确的数字!\033[0m" update fi @@ -304,26 +306,26 @@ read -p "请输入对应数字 > " num corelink="$update_url/bin/$clashcore/clash-linux-$cpucore" versionlink="$update_url/bin/$clashcore/version" #检测版本 -echo ----------------------------------------------- +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[33m正在检查更新!\033[0m" result=$(curl -w %{http_code} -skLo /tmp/clashversion $versionlink) [ "$result" != "200" ] && echo "检查更新失败!" && exit 1 source /tmp/clashversion -echo ----------------------------------------------- +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "当前clash核心:\033[0m $clashcore_n \033[33m$clashv\033[0m" echo -e "最新clash核心:\033[32m $clashcore \033[36m$version\033[0m" -echo ----------------------------------------------- +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ read -p "是否更新?[1/0] > " res if [ "$res" = '1' ]; then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo 正在连接服务器获取clash核心文件…………链接地址为: echo -e "\033[4;32m$corelink\033[0m" echo 如无法正常下载可以手动复制到浏览器下载核心文件! - echo -e "\033[36m-----------------------------------------------" + echo -e "\033[36m~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" echo -e "| |" echo -e "| 需要一点时间,请耐心等待! |" echo -e "| \033[0m如长时间没有数据请用ctrl+c退出 |" - echo -e "-----------------------------------------------\033[0m" + echo -e "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\033[0m" #获取在线clash核心文件 result=$(curl -w %{http_code} -kLo /tmp/clash.new $corelink) if [ "$result" != "200" ];then @@ -340,7 +342,7 @@ if [ "$res" = '1' ]; then sed -i '/clashv=*/'d $ccfg sed -i "1i\clashv=$version" $ccfg rm -rf /tmp/clashversion - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[32m$clashcore核心替换成功,请手动启动clash服务!\033[0m" clashsh fi @@ -349,19 +351,23 @@ getcore fi } getgeo(){ -echo ----------------------------------------------- -echo -e "\033[32m感谢Alecthw大神提供的优质GeoIP数据库!!!\033[0m" +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +echo -e "\033[30;46m感谢Alecthw大神提供的优质GeoIP数据库!!!\033[0m" echo ----------------------------------------------- echo -e "\033[33m请选择下载源:\033[0m" -echo -e " 1 我的个人服务器" +echo -e " 1 默认源:$update_url" echo -e " 2 Alecthw大神提供的服务器" echo -e " 0 返回上级菜单" read -p "请输入对应数字 > " num - if [[ $num == 0 ]]; then + if [ -z $num ]; then + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + echo -e "\033[31m请输入正确的数字!\033[0m" + update + elif [[ $num == 0 ]]; then update elif [[ $num == 1 ]]; then geolink="$update_url/bin/Country.mmdb" - echo $geolink + #echo $geolink elif [[ $num == 2 ]]; then geolink="http://www.ideame.top/mmdb/Country.mmdb" else @@ -369,16 +375,16 @@ read -p "请输入对应数字 > " num update exit; fi - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo 正在从服务器获取数据库文件………… result=$(curl -w %{http_code} -kLo $clashdir/Country.mmdb $geolink) if [ "$result" != "200" ];then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m文件下载失败!\033[0m" - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ getgeo else - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[32mGeoIP数据库文件下载成功!\033[0m" update fi @@ -386,7 +392,7 @@ update } getdb(){ host=$(ubus call network.interface.lan status | grep \"address\" | grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}';) -echo ----------------------------------------------- +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[36m安装本地版dashboard管理面板\033[0m" echo ----------------------------------------------- echo -e "\033[32m打开管理面板的速度更快且更稳定" @@ -396,9 +402,9 @@ echo ----------------------------------------------- read -p "是否安装本地面板?[1/0] > " res if [ "$res" = '1' ]; then if [ -d /www/clash ];then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m检测到您已经安装过本地面板了!\033[0m" - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ read -p "是否覆盖安装?[1/0] > " res if [ -z "$res" ]; then update @@ -409,13 +415,13 @@ if [ "$res" = '1' ]; then fi fi dblink="$update_url/bin/clashdb.tar.gz" - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo 正在连接服务器获取安装文件………… result=$(curl -w %{http_code} -kLo /tmp/clashdb.tar.gz $dblink) if [ "$result" != "200" ];then - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m文件下载失败!\033[0m" - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ getdb else echo -e "\033[33m下载成功,正在解压文件!\033[0m" @@ -423,7 +429,7 @@ if [ "$res" = '1' ]; then tar -zxvf '/tmp/clashdb.tar.gz' -C /www/clash > /dev/null [ $? -ne 0 ] && echo "文件解压失败!" && exit 1 echo -e "\033[32m面板安装成功!" - echo ----------------------------------------------- + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[36m请使用\033[32;4mhttp://$host/clash\033[0;36m访问面板\033[0m" rm -rf /tmp/clashdb.tar.gz update @@ -431,3 +437,42 @@ if [ "$res" = '1' ]; then fi update } +setserver(){ + +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +echo -e "\033[30;47m您可以在此处切换在线更新时使用的资源地址\033[0m" +echo -e "当前源:\033[4;32m$update_url\033[0m" +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 " 0 返回上级菜单" +read -p "请输入对应数字 > " num +if [ -z $num ]; then + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + echo -e "\033[31m请输入正确的数字!\033[0m" + update +elif [[ $num == 1 ]]; then + update_url="https://cdn.jsdelivr.net/gh/juewuy/clash-for-Miwifi" +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" +elif [[ $num == 3 ]]; then + update_url="-x 127.0.0.1:7890 https://raw.githubusercontent.com/juewuy/clash-for-Miwifi/master" +elif [[ $num == 4 ]]; then + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + read -p "请输入个人源路径 > " update_url +else + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + echo -e "\033[31m请输入正确的数字!\033[0m" + update +fi +#写入mark文件 +sed -i '/update_url*/'d $ccfg +sed -i "1i\update_url=\'$update_url\'" $ccfg +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +echo -e "\033[32m源地址更新成功!\033[0m" +update +} \ No newline at end of file