From 6fc597847f592907a9b03c939fe46d0b7b68bd1e Mon Sep 17 00:00:00 2001 From: juewuy Date: Sun, 23 Aug 2020 00:35:48 +0800 Subject: [PATCH] v0.9.9fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ~bug修复 --- bin/clashfm.tar.gz | Bin 13793 -> 13817 bytes bin/version | 2 +- scripts/clash.sh | 17 +++++++---------- scripts/getdate.sh | 44 ++++++++++++++++++++++++-------------------- scripts/start.sh | 2 +- 5 files changed, 33 insertions(+), 32 deletions(-) diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index c04c0c18c3070ed7bc2d7d1225ca3afe22ae610c..ad838da3f5cbbfd1ac9b63aadd14eba60c105483 100644 GIT binary patch literal 13817 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 literal 13793 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 X4RKheGL@-JWwN9%f /dev/null 2>&1 - fi + source $clashdir/start.sh && stop_old + /etc/init.d/clash stop > /dev/null 2>&1 } clashstart(){ if [ ! -f "$yaml" ];then @@ -107,7 +104,7 @@ clashstart(){ if [ "$start_old" = "已开启" ];then source $clashdir/start.sh && start_old sleep 1 - status=`ps |grep -w 'clash -d'|grep -v grep` + status=`ps |grep -w 'clash'|grep -v grep|grep -v clash.sh` if [ -z "$status" ];then echo -e "\033[31mclash启动失败!\033[0m" sed -i /start_old=*/d $ccfg @@ -116,12 +113,12 @@ clashstart(){ else /etc/init.d/clash start sleep 1 - status=`ps |grep -w 'clash -d'|grep -v grep` + status=`ps |grep -w 'clash'|grep -v grep|grep -v clash.sh` if [ -z "$status" ];then echo -e "\033[31mclash启动失败!尝试使用保守方式启动!\033[0m" source $clashdir/start.sh && start_old sleep 1 - status=`ps |grep -w 'clash -d'|grep -v grep` + status=`ps |grep -w 'clash'|grep -v grep|grep -v clash.sh` if [ -z "$status" ];then echo -e "\033[31mclash启动失败!\033[0m" sed -i /start_old=*/d $ccfg diff --git a/scripts/getdate.sh b/scripts/getdate.sh index e790217..3f1c760 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -94,26 +94,8 @@ else mv $yamlnew $yaml echo 配置文件已生成!正在启动clash使其生效! #重启clash服务 - if [ $status -gt 0 ];then - echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - killall -9 clash &> /dev/null - echo -e "\033[31mClash服务已停止!\033[0m" - fi - echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - if [ "$start_old" = "已开启" ];then - source $clashdir/start.sh && start_old - else - /etc/init.d/clash start - sleep 1 - status=`ps |grep -w 'clash -d'|grep -v grep` - if [ -z "$status" ];then - echo -e "\033[31mclash启动失败!尝试使用保守方式启动!\033[0m" - source $clashdir/start.sh && start_old - fi - fi - sleep 1 - status=`ps |grep -w 'clash -d'|grep -v grep|wc -l` - if [[ $status -gt 0 ]];then + killall -9 clash &> /dev/null + start_over(){ 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管理内置规则" @@ -121,7 +103,29 @@ else echo -e "也可前往更新菜单安装本地Dashboard面板,连接更稳定!\033[0m" echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ clashsh + } + if [ "$start_old" = "已开启" ];then + source $clashdir/start.sh && start_old + sleep 1 + status=`ps |grep -w 'clash'|grep -v grep|grep -v clash.sh|wc -l` + if [[ $status -gt 0 ]];then + start_over + fi else + /etc/init.d/clash start + sleep 1 + status=`ps |grep -w 'clash'|grep -v grep|grep -v clash.sh|wc -l` + if [[ $status -gt 0 ]];then + start_over + else + echo -e "\033[31mclash服务启动失败!尝试使用保守方式启动!\033[0m" + source $clashdir/start.sh && start_old + sleep 1 + status=`ps |grep -w 'clash'|grep -v grep|grep -v clash.sh|wc -l` + if [[ $status -gt 0 ]];then + start_over + fi + fi echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ if [ -f $yaml.bak ];then echo -e "\033[31mclash服务启动失败!已还原配置文件并重启clash!\033[0m" diff --git a/scripts/start.sh b/scripts/start.sh index 00738e8..82d8341 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -143,7 +143,7 @@ start_dns(){ } daemon_old(){ #守护进程状态 - status=$(ps |grep -w 'clash -d'|grep -v grep) + status=$(ps |grep -w 'clash'|grep -v grep|grep -v clash.sh) [ -z $status ] && $clashdir/clash -d $clashdir && mark_time } checkcron(){