xm/ShellCrash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.9.4

Browse Source 
~调整安装初始化流程
~优化下载更新流程
~修复下载更新相关bug
This commit is contained in:
juewuy
2020-08-15 10:51:12 +08:00
parent be13387179
commit 5cabf6559e
4 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/clashfm.tar.gz
View File

Binary file not shown.

2
bin/version
View File

@@ -1 +1 @@
versionsh=0.9.3 versionsh=0.9.4

36
scripts/clash.sh
View File

@@ -4,7 +4,7 @@
getconfig(){ getconfig(){
#服务器地址 #服务器地址
if [ -z "$update_url" ]; then if [ -z "$update_url" ]; then
update_url=https://cdn.jsdelivr.net/gh/juewuy/clash-for-Miwifi/ update_url=https://cdn.jsdelivr.net/gh/juewuy/clash-for-Miwifi
fi fi
#文件路径 #文件路径
if [ -z "$clashdir" ];then if [ -z "$clashdir" ];then
@@ -79,13 +79,23 @@ if [ ! -f $clashdir/Country.mmdb ];then
echo -e "\033[31m没有找到GeoIP数据库文件，请先下载数据库！\033[0m" echo -e "\033[31m没有找到GeoIP数据库文件，请先下载数据库！\033[0m"
source $clashdir/getdate.sh source $clashdir/getdate.sh
getgeo getgeo
clashstart
fi fi
} }
clashstart(){ clashstart(){
if [ ! -f "$yaml" ];then
/etc/init.d/clash start echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
sleep 1 echo -e "\033[31m没有找到配置文件，请先导入节点/订阅链接！\033[0m"
status=`ps |grep -w 'clash -d'|grep -v grep|wc -l` clashlink
fi
if [ $status -gt 0 ];then
echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/etc/init.d/clash stop > /dev/null 2>&1
echo -e "\033[31mClash服务已停止！\033[0m"
fi
/etc/init.d/clash start
sleep 1
status=`ps |grep -w 'clash -d'|grep -v grep|wc -l`
if [[ $status -gt 0 ]];then 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}';) 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 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -93,9 +103,11 @@ status=`ps |grep -w 'clash -d'|grep -v grep|wc -l`
echo -e "可以使用\033[30;47m http://clash.razord.top \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 "Host地址:\033[36m $host \033[0m 端口:\033[36m 9999 \033[0m"
echo -e "也可前往更新菜单安装本地Dashboard面板，连接更稳定！\033[0m" echo -e "也可前往更新菜单安装本地Dashboard面板，连接更稳定！\033[0m"
echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
else else
echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
echo -e "\033[31mclash服务启动失败！请检查配置文件！\033[0m" echo -e "\033[31mclash服务启动失败！请检查配置文件！\033[0m"
echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
fi fi
} }
clashlink(){ clashlink(){
@@ -566,6 +578,7 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then
elif [[ $num == 3 ]]; then elif [[ $num == 3 ]]; then
source $clashdir/getdate.sh source $clashdir/getdate.sh
getgeo getgeo
update
elif [[ $num == 4 ]]; then elif [[ $num == 4 ]]; then
source $clashdir/getdate.sh source $clashdir/getdate.sh
@@ -749,18 +762,9 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then
exit; exit;
elif [[ $num == 1 ]]; then elif [[ $num == 1 ]]; then
if [ ! -f "$yaml" ];then
echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
echo -e "\033[31m没有找到配置文件，请先导入节点/订阅链接！\033[0m"
clashlink
fi
if [ $status -gt 0 ];then
echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/etc/init.d/clash stop > /dev/null 2>&1
echo -e "\033[31mClash服务已停止！\033[0m"
fi
clashstart clashstart
clashsh exit;
elif [[ $num == 2 ]]; then elif [[ $num == 2 ]]; then
clashadv clashadv

29
scripts/getdate.sh
View File

@@ -26,6 +26,7 @@ https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_On
EOF` EOF`
#如果传来的是Url链接则合成Https链接，否则直接使用Https链接 #如果传来的是Url链接则合成Https链接，否则直接使用Https链接
if [ -z $Https ];then if [ -z $Https ];then
echo $Url
Https="https://$Server/sub?target=clashr&new_name=true&url=$Url&insert=false&config=$Config" Https="https://$Server/sub?target=clashr&new_name=true&url=$Url&insert=false&config=$Config"
markhttp=1 markhttp=1
fi fi
@@ -55,12 +56,13 @@ if [ "$result" != "200" ];then
read -p "是否更换后端地址后重试？[1/0] > " res read -p "是否更换后端地址后重试？[1/0] > " res
if [ "$res" = '1' ]; then if [ "$res" = '1' ]; then
sed -i '/server_link=*/'d $ccfg sed -i '/server_link=*/'d $ccfg
if [ "$server_link" = '7' ]; then if [[ $server_link == 7 ]]; then
server_link=0 server_link=0
fi fi
server_link=$(($server_link + 1)) server_link=$(($server_link + 1))
#echo $server_link echo $server_link
sed -i "1i\server_link=$server_link" $ccfg sed -i "1i\server_link=$server_link" $ccfg
Https=""
getyaml getyaml
fi fi
#exit; #exit;
@@ -72,20 +74,20 @@ else
mv $yaml $yaml.bak mv $yaml $yaml.bak
fi fi
mv $yamlnew $yaml mv $yamlnew $yaml
echo 配置文件已生成！正在重启clash使其生效！ echo 配置文件已生成！正在启动clash使其生效！
#重启clash服务 #重启clash服务
/etc/init.d/clash restart /etc/init.d/clash stop > /dev/null 2>&1
/etc/init.d/clash start
sleep 1 sleep 1
status=`ps |grep -w 'clash -d'|grep -v grep|wc -l` status=`ps |grep -w 'clash -d'|grep -v grep|wc -l`
if [[ $status -gt 0 ]];then 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[32mclash服务已启动！\033[0m"
echo -e "可以使用\033[30;47m http://clash.razord.top \033[0m管理clash内置规则" echo -e "可以使用\033[30;47m http://clash.razord.top \033[0m管理内置规则"
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 "Host地址:\033[36m $host \033[0m 端口:\033[36m 9999 \033[0m"
echo -e "Host地址:\033[30;46m $host \033[0m;端口:\033[30;46m 9999 \033[0m" echo -e "也可前往更新菜单安装本地Dashboard面板，连接更稳定！\033[0m"
#将用户链接写入mark sleep 1
#sed -i '/Https=*/'d $ccfg
#sed -i "7i\Https=\'$Https\'" $ccfg
clashsh clashsh
else else
echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -93,9 +95,11 @@ else
echo -e "\033[31mclash服务启动失败！已还原配置文件并重启clash！\033[0m" echo -e "\033[31mclash服务启动失败！已还原配置文件并重启clash！\033[0m"
mv $yaml.bak $yaml mv $yaml.bak $yaml
/etc/init.d/clash start /etc/init.d/clash start
sleep 1
clashsh clashsh
else else
echo -e "\033[31mclash服务启动失败！请利用测试菜单排查问题！\033[0m" echo -e "\033[31mclash服务启动失败！请利用测试菜单排查问题！\033[0m"
sleep 1
clashsh clashsh
fi fi
fi fi
@@ -153,6 +157,7 @@ do
sed -i '/Url=*/'d $ccfg sed -i '/Url=*/'d $ccfg
sed -i '/Https=*/'d $ccfg sed -i '/Https=*/'d $ccfg
sed -i "6i\Url=\'$Url\'" $ccfg sed -i "6i\Url=\'$Url\'" $ccfg
Https=""
#获取在线yaml文件 #获取在线yaml文件
getyaml getyaml
fi fi
@@ -278,7 +283,7 @@ clashcore_n=$clashcore
cpucore=$(uname -ms | tr ' ' '_' | tr '[A-Z]' '[a-z]') cpucore=$(uname -ms | tr ' ' '_' | tr '[A-Z]' '[a-z]')
[ -n "$(echo $cpucore | grep -E "linux.*aarch64.*")" ] && cpucore="armv8" [ -n "$(echo $cpucore | grep -E "linux.*aarch64.*")" ] && cpucore="armv8"
[ -n "$(echo $cpucore | grep -E "linux.*armv7.*")" ] && cpucore="armv7" [ -n "$(echo $cpucore | grep -E "linux.*armv7.*")" ] && cpucore="armv7"
[ -n "$(echo $cpucore | grep -E "linux.*armv5.*")" ] && cpucore="armv5" [ -n "$(echo $cpucore | grep -E "linux.*armv.*")" ] && cpucore="armv5"
[ -n "$(echo $cpucore | grep -E "linux.*mips.*")" ] && cpucore="mipsle-softfloat" [ -n "$(echo $cpucore | grep -E "linux.*mips.*")" ] && cpucore="mipsle-softfloat"
[ -n "$(echo $cpucore | grep -E "linux.*x86.*")" ] && cpucore="386" [ -n "$(echo $cpucore | grep -E "linux.*x86.*")" ] && cpucore="386"
### ###
@@ -398,9 +403,7 @@ read -p "请输入对应数字 > " num
else else
echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
echo -e "\033[32mGeoIP数据库文件下载成功！\033[0m" echo -e "\033[32mGeoIP数据库文件下载成功！\033[0m"
update
fi fi
update
} }
getdb(){ 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}';) 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}';)