mirror of
https://github.com/juewuy/ShellCrash.git
synced 2024-11-15 19:22:54 +08:00
v1.0.0beta5
~更名为ShellClash，支持更多设备 ~调整脚本更新链接 ~修复debian等系统下使用dash运行时报错的bug
This commit is contained in:
juewuy
parent
5b90f49c4f
commit
7be54e1031
Binary file not shown.
|
|
@ -1,2 +1,2 @@
|
|||
GeoIP_v=20200908
|
||||
versionsh=1.0.0beta4
|
||||
versionsh=1.0.0.beta5
|
||||
|
|
|
|||
18
install.sh
18
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 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user