From 7be54e1031854396bcbd2543aa45f0de5db76a1a Mon Sep 17 00:00:00 2001 From: juewuy Date: Sun, 13 Sep 2020 19:33:39 +0800 Subject: [PATCH] =?UTF-8?q?v1.0.0beta5=20~=E6=9B=B4=E5=90=8D=E4=B8=BAShell?= =?UTF-8?q?Clash=EF=BC=8C=E6=94=AF=E6=8C=81=E6=9B=B4=E5=A4=9A=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=20~=E8=B0=83=E6=95=B4=E8=84=9A=E6=9C=AC=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=93=BE=E6=8E=A5=20~=E4=BF=AE=E5=A4=8Ddebian?= =?UTF-8?q?=E7=AD=89=E7=B3=BB=E7=BB=9F=E4=B8=8B=E4=BD=BF=E7=94=A8dash?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=97=B6=E6=8A=A5=E9=94=99=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/clashfm.tar.gz | Bin 15330 -> 15461 bytes bin/version | 2 +- install.sh | 18 +++++++++--------- scripts/clash.sh | 27 +++++++++++++++++---------- scripts/getdate.sh | 5 +++-- 5 files changed, 30 insertions(+), 22 deletions(-) diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index 53079d6d070dcf032acdd1d31002dfed7fbc8965..3fc3abdafd6e22e5439b3e87eee5a462bb76ad0f 100644 GIT binary patch literal 15461 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 br{(Xzezy4k@&EXL{7c7I4|9Zu03HDVZLt*7 literal 15330 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 A5C8xG diff --git a/bin/version b/bin/version index d97c137..5ffe6cc 100644 --- a/bin/version +++ b/bin/version @@ -1,2 +1,2 @@ GeoIP_v=20200908 -versionsh=1.0.0beta4 +versionsh=1.0.0.beta5 diff --git a/install.sh b/install.sh index 0d6f4b7..82b66a1 100644 --- a/install.sh +++ b/install.sh @@ -1,23 +1,22 @@ - #!/bin/sh +#! /bin/bash # Copyright (C) Juewuy echo "***********************************************" echo "** 欢迎使用 **" -echo "** Clash for Miwifi **" +echo "** ShellClash **" echo "** by Juewuy **" echo "***********************************************" - 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 echo -e "~~~~版本:\033[32m$versionsh\033[0m" echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -echo -e "\033[44m使用中如遇问题请加TG群反馈:\033[42;30m t.me/clashfm \033[0m" +echo -e "\033[44m如遇问题请加TG群反馈:\033[42;30m t.me/clashfm \033[0m" echo -e "\033[37m支持各种基于openwrt的路由器设备" echo -e "\033[33m有限支持debian、centos等Linux系统\033[0m" echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -echo -e "\033[32m 1 在默认目录(/etc)安装Clash for Miwifi" +echo -e "\033[32m 1 在默认目录(/etc)安装ShellClash" echo -e "\033[33m 2 手动设置安装目录(不明勿用!)" echo -e "\033[0m 0 退出安装" echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -26,9 +25,9 @@ read -p "请输入相应数字 > " num if [ -z $num ];then echo 安装已取消 exit; -elif [[ $num == 1 ]];then +elif [ "$num" = "1" ];then dir=/etc -elif [[ $num == 2 ]];then +elif [ "$num" = "2" ];then echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo '可用路径 剩余空间:' df -h | awk '{print $6,$2}'| sed 1d @@ -71,15 +70,16 @@ fi sed -i '/versionsh_l=*/'d $dir/clash/mark sed -i "1i\versionsh_l=$versionsh" $dir/clash/mark #设置环境变量 +shtype=sh&&[ -n $(ls -l /bin/sh|grep -o dash) ]&&shtype=bash sed -i '/alias clash=*/'d /etc/profile -echo "alias clash=\"sh $dir/clash/clash.sh\"" >> /etc/profile #设置快捷命令环境变量 +echo "alias clash=\"$shtype $dir/clash/clash.sh\"" >> /etc/profile #设置快捷命令环境变量 sed -i '/export clashdir=*/'d /etc/profile echo "export clashdir=\"$dir/clash\"" >> /etc/profile #设置clash路径环境变量 #删除临时文件 rm -rf /tmp/clashfm.tar.gz #提示 echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -echo clash for Miwifi 已经安装成功! +echo ShellClash 已经安装成功! echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[33m输入\033[30;47m clash \033[0;33m命令即可管理!!!\033[0m" echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/scripts/clash.sh b/scripts/clash.sh index d638919..8597410 100644 --- a/scripts/clash.sh +++ b/scripts/clash.sh @@ -1,4 +1,4 @@ - #!/bin/sh +#!/bin/bash # Copyright (C) Juewuy getconfig(){ @@ -57,12 +57,12 @@ fi #输出状态 echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -echo -e "\033[30;46m欢迎使用Clash for Miwifi!\033[0m 版本:$versionsh_l" +echo -e "\033[30;46m欢迎使用ShellClash!\033[0m 版本:$versionsh_l" 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;4mhttps://juewuy.xyz\033[0m,TG群:\033[36;4mhttps://t.me/clashfm\033[0m" +echo -e "TG群:\033[36;4mhttps://t.me/clashfm\033[0m" echo ----------------------------------------------- #检查clash核心 if [ ! -f $clashdir/clash ];then @@ -130,10 +130,16 @@ clashstart(){ 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 -e "\033[32mclash服务已启动!\033[0m" - echo -e "可以使用\033[30;47m http://clash.razord.top \033[0m管理内置规则" - echo -e "Host地址:\033[36m $host \033[0m 端口:\033[36m 9999 \033[0m" - echo -e "也可前往更新菜单安装本地Dashboard面板,连接更稳定!\033[0m" - echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + if [ -d /www/clash ];then + echo -e "请使用\033[30;47m http://$host/clash \033[0m管理内置规则" + elif [ -d $clashdir/ui ];then + echo -e "请使用\033[30;47m http://$host:9999/ui \033[0m管理内置规则" + else + echo -e "可使用\033[30;47m http://clash.razord.top \033[0m管理内置规则" + echo -e "Host地址:\033[36m $host \033[0m 端口:\033[36m 9999 \033[0m" + echo -e "也可前往更新菜单安装本地Dashboard面板,连接更稳定!\033[0m" + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + fi } clashlink(){ #获取订阅规则 @@ -154,7 +160,7 @@ echo ----------------------------------------------- echo -e " 1 导入\033[36m节点/订阅\033[0m链接" echo -e " 2 使用完整clash规则链接" echo -e " 3 添加/修改\033[32m节点过滤\033[0m关键字 \033[47;30m$exclude\033[0m" -echo -e " 4 选取\033[33m配置规则\033[0m模版" +echo -e " 4 选取\033[33mclash配置规则\033[0m模版" echo -e " 5 选择在线生成服务器" echo -e " 6 \033[36m还原\033[0m配置文件" echo -e " 7 \033[32m手动更新\033[0m订阅" @@ -260,8 +266,8 @@ fi } clashcfg(){ #获取设置默认显示 -[ -z "$skip_cert" ] && skip_cert=未开启 -[ -z "$common_ports" ] && common_ports=未开启 +[ -z "$skip_cert" ] && skip_cert=已开启 +[ -z "$common_ports" ] && common_ports=已开启 [ -z "$dns_mod" ] && dns_mod=redir_host [ -z "$dns_over" ] && dns_over=已开启 if [ -z "$(cat $clashdir/mac)" ]; then @@ -617,6 +623,7 @@ update(){ 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[32malecthw大神提供的GeoIP数据库\033[0m 项目地址:\033[32mhttps://github.com/alecthw/mmdb_china_ip_list\033[0m" echo -e "感谢:\033[32m更多的帮助过我的人!\033[0m" echo ----------------------------------------------- echo -e " 1 更新\033[36m管理脚本\033[0m" diff --git a/scripts/getdate.sh b/scripts/getdate.sh index 6caf759..d3b546b 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright (C) Juewuy getyaml(){ @@ -146,7 +146,7 @@ else echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[33m获取到了配置文件,但格式似乎不对!\033[0m" echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - sed -n '1,20p' $yamlnew + sed -n '1,30p' $yamlnew echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[33m请检查如上配置文件信息:\033[0m" echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -433,6 +433,7 @@ clashcore_n=$clashcore cpucore=$(uname -ms | tr ' ' '_' | tr '[A-Z]' '[a-z]') [ -n "$(echo $cpucore | grep -E "linux.*armv.*")" ] && cpucore="armv5" [ -n "$(echo $cpucore | grep -E "linux.*aarch64.*")" ] && cpucore="armv8" +[ -n "$(echo $cpucore | grep -E "linux.*armv8.*")" ] && cpucore="armv8" [ -n "$(echo $cpucore | grep -E "linux.*armv7.*")" ] && cpucore="armv7" [ -n "$(echo $cpucore | grep -E "linux.*mips.*")" ] && cpucore="mipsle-softfloat" [ -n "$(echo $cpucore | grep -E "linux.*x86.*")" ] && cpucore="386"