已修改 bin/release_version

已修改        README_CN.md

README.md

@@ -1,70 +1,108 @@
+<h1 align="center">
+  <img src="https://github.com/Dreamacro/clash/raw/master/docs/logo.png" alt="Clash" width="200">
+  <br>ShellClash<br>
+</h1>
 
 
-# ShellClash（原Clash for Miwifi）
+  <p align="center">
+	<a target="_blank" href="https://github.com/Dreamacro/clash/releases">
+    <img src="https://img.shields.io/github/release/Dreamacro/Clash.svg?style=flat-square&label=Clash">
+  </a>
+  <a target="_blank" href="https://github.com/juewuy/ShellClash/releases">
+    <img src="https://img.shields.io/github/release/juewuy/ShellClash.svg?style=flat-square&label=ShellClash&colorB=green">
+  </a>
+</p>
 
-在Shell环境下一键部署及管理[Clash](https://github.com/Dreamacro/clash)
-=====
+[中文](README_CN.md) | English
 
-功能简介：
---
-~通过管理脚本在Shell环境下便捷使用[Clash](https://github.com/Dreamacro/clash)<br>
-~支持在Shell环境下管理[Clash各种功能](https://lancellc.gitbook.io/clash)<br>
-~支持批量导入[Clash](https://github.com/Dreamacro/clash)支持的节点链接及订阅链接<br>~支持配置定时任务，以及定时更新订阅<br>~支持在线安装及使用网页面板管理规则组<br>
-~支持局域网透明代理/纯净模式等多种模式切换<br>~支持在线更新管理脚本及升级Clash核心<br>
+## Function introduction: 
 
-设备支持：
+~Convenient use in Shell environment through management script [Clash](https://github.com/Dreamacro/clash)<br>~Support management of [Clash functions](https://lancellc.gitbook.io/clash)<br>~Support online import [Clash](https://github.com/Dreamacro/clash) supports sharing, subscription and configuration links<br>~Support configuration timing tasks, support configuration file timing updates<br>~Support online installation and Use local web panel to manage built-in rules<br>~Support routing mode, native mode and other mode switching<br>~Support GNOME, KDE desktop automatic configuration native mode<br>~Support online update<br>
+
+## Equipment support:
+
+~Support various router devices based on OpenWrt or secondary custom development using OpenWrt<br>~Support various devices running standard Linux systems (such as Debian/CenOS/Armbian, etc.)<br>~Compatible with Padavan firmware (conservative mode), Pandora firmware<br>~Compatible with various types of devices customized and developed using the Linux kernel<br>——————————<br>~For more device support, please submit an issue or go to the TG group for feedback (the device name and the device core information returned by running uname -a must be provided)<br>
+
+How to use:
 --
 
-~支持小米/红米全系使用官方系统或官方开发版系统的路由器设备<br>
-~支持各种基于OpenWrt或使用OpenWrt二次定制开发的路由器设备<br>
-~支持各种运行标准Linux系统（如Debian/CenOS/Armbian等）的设备<br>~兼容Padavan固件（保守模式）、潘多拉固件<br>——————————
-~暂不支持高恪、梅林等固件<br>
-~更多设备支持，请提issue或前往TG群反馈（需提供设备名称及运行uname -a返回的设备核心信息）<br>
+~Confirm that the router device has enabled SSH and obtained root privileges (Linux devices with GUI desktops can be installed using their own terminal)<br>~Use SSH connection tools (such as putty, JuiceSSH, system built-in terminal, etc.) router or Linux device SSH management interface or terminal interface, and switch to the root user<br>~Confirm that the curl or wget download tool has been installed on the device. If not installed, please [refer to here](https://www.howtoforge.com/install-curl-in-linux) for LInux devices to install curl. For devices based on OpenWrt (Xiaomi official system, Pandora, Gaoke, etc.), please Use the following command to install curl:<br>
 
-使用方式：
---
-~确认路由器或设备已经开启SSH并获取root权限<br>
-~使用SSH连接工具（如putty，JuiceSSH，系统自带终端等）路由器或设备的SSH管理界面，并切换到root用户<br>
-~确认设备已经安装curl，如未安装，LInux设备请[参考此处](https://www.howtoing.com/install-curl-in-linux)进行安装，基于OpenWrt（小米官方系统、潘多拉、高恪等）的设备请使用如下命令安装：<br>
-
-```shell
+```sh
 opkg update && opkg install curl
 ```
 
-~之后在SSH界面执行如下安装命令，并按照后续提示完成安装<br>
+~ Then execute the following installation commands on the SSH interface, and follow the subsequent prompts to complete the installation<br>
 
-~使用curl：<br>
+##### ~Use curl:<br>
 
 ```Shell
-#Release版本-github直连
+#Release version - by github
 sh -c "$(curl -kfsSl --resolve raw.githubusercontent.com:443:199.232.68.133 https://raw.githubusercontent.com/juewuy/ShellClash/master/install.sh)" && source /etc/profile &> /dev/null
-#Release版本-jsdelivrCDN源
+#Release version - by jsdelivrCDN
 sh -c "$(curl -kfsSl https://cdn.jsdelivr.net/gh/juewuy/ShellClash@master/install.sh)" && source /etc/profile &> /dev/null
-#Test版本-github直连
+#Test version - by github
 sh -c "$(curl -kfsSl --resolve raw.githubusercontent.com:443:199.232.68.133 https://raw.githubusercontent.com/juewuy/ShellClash/master/install.sh)" -s 1 && source /etc/profile &> /dev/null
 ```
 
-~安装完成管理脚本后，执行如下命令以运行管理脚本<br>
+##### ~Use wget：<br>
 
-```Shell
-clash
+```sh
+#Release version - by jsdelivrCDN
+wget -q --no-check-certificate -O /tmp/install.sh https://cdn.jsdelivr.net/gh/juewuy/ShellClash@master/install.sh  && sh /tmp/install.sh && source /etc/profile &> /dev/null
 ```
 
-更新日志：
---
-https://github.com/juewuy/ShellClash/releases
+~**After installation by non-root users**, please execute the following additional commands to read environment variables:<br>
 
-交流反馈：
---
-### https://t.me/clashfm 
+```shell
+source ~/.bashrc &> /dev/null
+```
 
-已知问题：
---
-~Tun模式下clash服务可能会和路由器内置的网游加速器冲突，请谨慎同时使用<br>
-~Redir模式暂不支持转发udp流量，外服游戏可能会受影响，外服游戏用户建议使用Tun模式<br>
-~部分设备长时间使用会出现内存占用偏高——此为golang内存回收不及时导致，可以通过屏蔽p2p流量及设置每日定时重启核心以缓解<br>
-~节点无法连接——在【clash功能设置】中打开【跳过本地证书验证】或者升级clash核心<br>
+~After installing the management script, execute the following command to **run the management script**<br>
+
+```Shell
+clash #normal mode
+clash -h #help
+clash -t #test mode
+```
+
+~**Additional dependencies at runtime**：<br>
+
+```
+Most of the equipment/systems are pre-installed with most of the following dependencies, you can ignore them if there is no impact when you use them.
+```
+
+```sh
+bash/ash		necessary		Cannot install and run scripts when all are missing
+curl/wget		necessary		When all are missing, it cannot be installed and updated online
+iptables		important		Only use pure mode when missing
+systemd/rc.common	general		Only use conservative mode when all are missing
+iptables-mod-nat	general		Cannot use redir mode, mixed mode when missing
+ip6tables-mod-nat	lower		Affects redir mode when missing, mixed mode support for ipv6
+crontab			lower		Cannot enable timing task function when missing
+net-tools		minimal		Cannot detect port occupancy normally when missing
+ubus/iproute-doc	minimal		The host address of the machine cannot be obtained normally when missing
+```
+
+
+
+## Update log: 
+
+### [Click to view](https://github.com/juewuy/ShellClash/releases) 
+
+## Exchange feedback: 
+
+### [TG Discussion Group](https://t.me/clashfm)
+
+## Related Q&A:
+
+### [See blog for details](https://juewuy.github.io)
+
+## Donate this project
+
+### [Go to page](https://juewuy.github.io/yOF4Yf06Q/)
+
+## Friendly promotion: 
+
+### [Top 8K Airport-Dler](https://dler.best/auth/register?affid=89698)
 
-友情推广：
---
-[顶级8K专线机场-墙洞](https://dler.best/auth/register?affid=89698)

README_CN.md

@@ -0,0 +1,117 @@
+<h1 align="center">
+  <img src="https://github.com/Dreamacro/clash/raw/master/docs/logo.png" alt="Clash" width="200">
+  <br>ShellClash<br>
+</h1>
+
+
+  <p align="center">
+	<a target="_blank" href="https://github.com/Dreamacro/clash/releases">
+    <img src="https://img.shields.io/github/release/Dreamacro/Clash.svg?style=flat-square&label=Clash">
+  </a>
+  <a target="_blank" href="https://github.com/juewuy/ShellClash/releases">
+    <img src="https://img.shields.io/github/release/juewuy/ShellClash.svg?style=flat-square&label=ShellClash&colorB=green">
+  </a>
+</p>
+
+中文 | [English](README.md) 
+
+功能简介：
+--
+
+~通过管理脚本在Shell环境下便捷使用[Clash](https://github.com/Dreamacro/clash)<br>
+~支持在Shell环境下管理[Clash各种功能](https://lancellc.gitbook.io/clash)<br>
+~支持在线导入[Clash](https://github.com/Dreamacro/clash)支持的分享、订阅及配置链接<br>~支持配置定时任务，支持配置文件定时更新<br>~支持在线安装及使用本地网页面板管理内置规则<br>
+~支持路由模式、本机模式等多种模式切换<br>~支持GNOME、KDE桌面自动配置本机模式<br>~支持在线更新<br>
+
+设备支持：
+--
+
+~支持各种基于OpenWrt或使用OpenWrt二次定制开发的路由器设备<br>
+~支持各种运行标准Linux系统（如Debian/CenOS/Armbian等）的设备<br>~兼容Padavan固件（保守模式）、潘多拉固件<br>~兼容各类使用Linux内核定制开发的各类型设备<br>
+
+——————————<br>
+~更多设备支持，请提issue或前往TG群反馈（需提供设备名称及运行uname -a返回的设备核心信息）<br>
+
+使用方式：
+--
+~确认路由器设备已经开启SSH并获取root权限（带GUI桌面的Linux设备可使用自带终端安装）<br>
+~使用SSH连接工具（如putty，JuiceSSH，系统自带终端等）路由器或Linux设备的SSH管理界面或终端界面，并切换到root用户<br>
+~确认设备已经安装curl或者wget下载工具。如未安装，LInux设备请[参考此处](https://www.howtoing.com/install-curl-in-linux)安装curl，基于OpenWrt（小米官方系统、潘多拉、高恪等）的设备请使用如下命令安装curl：<br>
+
+```shell
+opkg update && opkg install curl
+```
+
+~之后在SSH界面执行如下安装命令，并按照后续提示完成安装<br>
+
+~**使用curl安装**：<br>
+
+```Shell
+#Release版本-github直连
+sh -c "$(curl -kfsSl --resolve raw.githubusercontent.com:443:199.232.68.133 https://raw.githubusercontent.com/juewuy/ShellClash/master/install.sh)" && source /etc/profile &> /dev/null
+#Release版本-jsdelivrCDN源
+sh -c "$(curl -kfsSl https://cdn.jsdelivr.net/gh/juewuy/ShellClash@master/install.sh)" && source /etc/profile &> /dev/null
+#Test版本-github直连
+sh -c "$(curl -kfsSl --resolve raw.githubusercontent.com:443:199.232.68.133 https://raw.githubusercontent.com/juewuy/ShellClash/master/install.sh)" -s 1 && source /etc/profile &> /dev/null
+```
+
+~**使用wget安装**：<br>
+
+```sh
+#Release版本-jsdelivrCDN源
+wget -q --no-check-certificate -O /tmp/install.sh https://cdn.jsdelivr.net/gh/juewuy/ShellClash@master/install.sh  && sh /tmp/install.sh && source /etc/profile &> /dev/null
+```
+
+~**非root用户安装后**请额外执行以下命令以读取环境变量：<br>
+
+```shell
+source ~/.bashrc &> /dev/null
+```
+
+~安装完成管理脚本后，执行如下命令以**运行管理脚本**<br>
+
+```Shell
+clash #正常模式运行
+clash -h #脚本帮助及说明
+clash -t #测试模式运行
+```
+
+~**运行时的额外依赖**：<br>
+
+`大部分的设备/系统都已经预装了以下的大部分依赖，使用时如无影响可以无视之`
+
+```sh
+bash/ash		必须		全部缺少时无法安装及运行脚本
+curl/wget		必须		全部缺少时无法在线安装及更新，无法使用节点保存功能
+iptables		重要		缺少时只能使用纯净模式
+systemd/rc.common	一般		全部缺少时只能使用保守模式
+iptables-mod-nat	一般		缺少时无法使用redir模式，混合模式
+ip6tables-mod-nat	较低		缺少时影响redir模式，混合模式对ipv6的支持
+crontab			较低		缺少时无法启用定时任务功能
+net-tools		极低		缺少时无法正常检测端口占用
+ubus/iproute-doc	极低		缺少时无法正常获取本机host地址
+```
+
+
+
+更新日志：
+--
+
+### [点击查看](https://github.com/juewuy/ShellClash/releases)
+
+交流反馈：
+--
+### [TG讨论组](https://t.me/clashfm) 
+
+相关Q&A：
+--
+
+### [详见博客](https://juewuy.github.io)
+
+## 捐赠此项目：
+
+### [前往页面](https://juewuy.github.io/yOF4Yf06Q/)
+
+友情推广：
+--
+### [顶级8K专线机场-墙洞](https://dler.best/auth/register?affid=89698)

bin/release_version

@@ -0,0 +1,6 @@
+1.0.0beta18.2
+1.0.0beta17
+1.0.0beta15
+1.0.0beta11
+1.0.0beta5
+0.9.7

bin/version

@@ -1,4 +1,4 @@
-clash_v=1.2.0
-clashpre_v=2020.10.09
-GeoIP_v=20201010
-versionsh=1.0.0beta14fix5
+clash_v=1.3.0
+clashpre_v=2020.11.20
+GeoIP_v=20201218
+versionsh=1.0.0beta18.2

install.sh

@@ -1,7 +1,7 @@
 #! /bin/bash
 # Copyright (C) Juewuy
 
-echo='echo -e' && [ -n "$(ls -l /bin/sh|grep -o dash)" ] && echo=echo
+echo='echo -e' && [ -n "$(echo -e|grep e)" ] && echo=echo
 [ -z "$1" ] && test=0 || test=$1
 
 echo "***********************************************"
@@ -11,30 +11,58 @@ echo "**                             by  Juewuy    **"
 echo "***********************************************"
 
 #检查root权限
-[ "$USER" != "root" ] && [ "$USER" != "admin" ] && echo 请使用root用户执行安装！&& exit 1
-
+if [ "$USER" != "root" ];then
+	echo 当前用户:$USER
+	$echo "\033[31m请尽量使用root用户执行安装!\033[0m"
+	echo -----------------------------------------------
+	read -p "仍要安装？可能会产生大量未知错误！(1/0) > " res
+	[ "$res" != "1" ] && exit
+fi
+webget(){
+	#参数【$1】代表下载目录，【$2】代表在线地址
+	#参数【$3】代表输出显示，【$4】不启用重定向
+	if curl --version > /dev/null 2>&1;then
+		[ "$3" = "echooff" ] && progress='-s' || progress='-#'
+		[ -z "$4" ] && redirect='-L' || redirect=''
+		result=$(curl -w %{http_code} --connect-timeout 5 $progress $redirect -ko $1 $2)
+	else
+		[ "$3" = "echooff" ] && progress='-q' || progress='-q --show-progress'
+		[ "$3" = "echoon" ] && progress=''
+		[ -z "$4" ] && redirect='' || redirect='--max-redirect=0'
+		wget -Y on $progress $redirect --no-check-certificate --timeout=5 -O $1 $2 
+		[ $? -eq 0 ] && result="200"
+	fi
+}
 #检查更新
 url="https://cdn.jsdelivr.net/gh/juewuy/ShellClash"
 if [ "$test" -gt 0 ];then 
-	url="--resolve raw.githubusercontent.com:443:199.232.68.133 https://raw.githubusercontent.com/juewuy/ShellClash/master"
-	[ "$test" -eq 2 ] && url="http://192.168.31.30:8080/clash-for-Miwifi" && echo $url
+	url="https://cdn.jsdelivr.net/gh/juewuy/ShellClash@master"
+	[ "$test" -eq 2 ] && url="http://192.168.31.31:8080/ShellClash"
 	[ "$test" -eq 3 ] && url="http://192.168.123.90:8080/clash-for-Miwifi"
 else
-	release_new=$(curl -kfsSL --resolve api.github.com:443:140.82.113.5 "https://api.github.com/repos/juewuy/ShellClash/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')	#检查版本
+	webget /tmp/clashrelease $url@master/bin/release_version echoon rediroff 2>/tmp/clashrelease
+	[ "$result" = "200" ] && release_new=$(cat /tmp/clashrelease | head -1)
+	[ -z "$release_new" ] && release_new=master
+	url=$url@$release_new
 fi
-[ -z "$release_new" ] && release_new=$(curl -kfsSL $url/bin/version | grep "versionsh" | awk -F "=" '{print $2}')
+webget /tmp/clashversion $url/bin/version echooff
+[ "$result" = "200" ] && versionsh=$(cat /tmp/clashversion | grep "versionsh" | awk -F "=" '{print $2}')
+[ -z "$release_new" ] && release_new=$versionsh
+rm -rf /tmp/clashversion
+rm -rf /tmp/clashrelease
 [ -z "$release_new" ] && echo "无法连接服务器！" && exit
-tarurl=$url@$release_new/bin/clashfm.tar.gz
-[ "$test" -gt 0 ] && tarurl=$url/bin/clashfm.tar.gz
+
+tarurl=$url/bin/clashfm.tar.gz
+
 gettar(){
-	result=$(curl -w %{http_code} -kLo /tmp/clashfm.tar.gz $tarurl)
+	webget /tmp/clashfm.tar.gz $tarurl
 	[ "$result" != "200" ] && echo "文件下载失败！" && exit 1
 	#解压
 	echo -----------------------------------------------
 	echo 开始解压文件！
 	mkdir -p $clashdir > /dev/null
 	tar -zxvf '/tmp/clashfm.tar.gz' -C $clashdir/
-	[ $? -ne 0 ] && echo "文件解压失败！" && exit 1 
+	[ $? -ne 0 ] && echo "文件解压失败！" && rm -rf /tmp/clashfm.tar.gz && exit 1 
 	#初始化文件目录
 	[ -f "$clashdir/mark" ] || echo '#标识clash运行状态的文件，不明勿动！' > $clashdir/mark
 	#判断系统类型写入不同的启动文件
@@ -43,18 +71,17 @@ gettar(){
 			mv $clashdir/clashservice /etc/init.d/clash
 			chmod  777 /etc/init.d/clash
 	else
-		[ -d /etc/systemd/system/ ] && sysdir=/etc/systemd/system/
-		[ -d /usr/lib/systemd/system/ ] && sysdir=/usr/lib/systemd/system/ 
+		[ -w /etc/systemd/system ] && sysdir=/etc/systemd/system
+		[ -w /usr/lib/systemd/system ] && sysdir=/usr/lib/systemd/system
 		if [ -n "$sysdir" ];then
 			#设为systemd方式启动
 			mv $clashdir/clash.service $sysdir/clash.service
 			sed -i "s%/etc/clash%$clashdir%g" $sysdir/clash.service
 			systemctl daemon-reload
-			rm -rf /etc/init.d/clash
 		else
 			#设为保守模式启动
 			sed -i '/start_old=*/'d $clashdir/mark
-			sed -i "1i\start_old=已开启" $clashdir/mark
+			echo start_old=已开启 >> $clashdir/mark
 		fi
 	fi
 	#修饰文件及版本号
@@ -62,12 +89,14 @@ gettar(){
 	sed -i "s%#!/bin/sh%#!/bin/$shtype%g" $clashdir/start.sh
 	chmod  777 $clashdir/start.sh
 	sed -i '/versionsh_l=*/'d $clashdir/mark
-	sed -i "1i\versionsh_l=$release_new" $clashdir/mark
+	echo versionsh_l=$release_new >> $clashdir/mark
 	#设置环境变量
-	sed -i '/alias clash=*/'d /etc/profile
-	echo "alias clash=\"$shtype $clashdir/clash.sh\"" >> /etc/profile #设置快捷命令环境变量
-	sed -i '/export clashdir=*/'d /etc/profile
-	echo "export clashdir=\"$clashdir\"" >> /etc/profile #设置clash路径环境变量
+	[ -w ~/.bashrc ] && profile=~/.bashrc
+	[ -w /etc/profile ] && profile=/etc/profile
+	sed -i '/alias clash=*/'d $profile
+	echo "alias clash=\"$shtype $clashdir/clash.sh\"" >> $profile #设置快捷命令环境变量
+	sed -i '/export clashdir=*/'d $profile
+	echo "export clashdir=\"$clashdir\"" >> $profile #设置clash路径环境变量
 	#删除临时文件
 	rm -rf /tmp/clashfm.tar.gz 
 	rm -rf $clashdir/clashservice
@@ -81,15 +110,19 @@ echo -----------------------------------------------
 gettar
 echo -----------------------------------------------
 echo ShellClash 已经安装成功!
+[ "$USER" != "root" ] && echo "请执行【source ~/.bashrc &> /dev/null】命令以加载环境变量！"
 echo -----------------------------------------------
 $echo "\033[33m输入\033[30;47m clash \033[0;33m命令即可管理！！！\033[0m"
 echo -----------------------------------------------
 }
 setdir(){		
-echo -----------------------------------------------		
-$echo "\033[32m 1 在默认目录(/etc)安装"
-$echo "\033[33m 2 手动设置安装目录"
-$echo "\033[0m 0 退出安装"
+echo -----------------------------------------------
+$echo "\033[33m安装ShellClash至少需要预留约1MB的磁盘空间\033[0m"	
+$echo " 1 在\033[32m/etc目录\033[0m下安装(适合路由设备)"
+$echo " 2 在\033[32m/usr/share目录\033[0m下安装(适合大多数设备)"
+$echo " 3 在\033[32m当前用户目录\033[0m下安装(适合非root用户)"
+$echo " 4 手动设置安装目录"
+$echo " 0 退出安装"
 echo -----------------------------------------------
 read -p "请输入相应数字 > " num
 #设置目录
@@ -99,21 +132,31 @@ if [ -z $num ];then
 elif [ "$num" = "1" ];then
 	dir=/etc
 elif [ "$num" = "2" ];then
+	dir=/usr/share
+elif [ "$num" = "3" ];then
+	dir=~/.local/share
+	mkdir -p ~/.config/systemd/user
+elif [ "$num" = "4" ];then
 	echo -----------------------------------------------
 	echo '可用路径 剩余空间:'
-	df -h | awk '{print $6,$2}'| sed 1d 
+	df -h | awk '{print $6,$4}'| sed 1d 
 	echo '路径是必须带 / 的格式，写入虚拟内存(/tmp,/sys,..)的文件会在重启后消失！！！'
 	read -p "请输入自定义路径 > " dir
 	if [ -z "$dir" ];then
-		$echo "\033[31m路径错误！已取消安装！\033[0m"
-		exit;
+		$echo "\033[31m路径错误！请重新设置！\033[0m"
+		setdir
 	fi
 else
 	echo 安装已取消！！！
 	exit;
 fi
-clashdir=$dir/clash
-install
+if [ ! -w $dir ];then
+	$echo "\033[31m没有$dir目录写入权限！请重新设置！\033[0m" && sleep 1 && setdir
+else
+	echo 目标目录磁盘剩余：$(df -h $dir | awk '{print $4}' | sed 1d )
+	read -p "确认安装？(1/0) > " res
+	[ "$res" = "1" ] && clashdir=$dir/clash || setdir
+fi
 }
 
 #输出
@@ -135,10 +178,16 @@ if [ -n "$clashdir" ];then
 		echo -----------------------------------------------
 		$echo "\033[31m 旧版本文件已卸载！\033[0m"
 		setdir
+		install
+	elif [ "$res" = "9" ];then
+		echo 测试模式，变更安装位置
+		setdir
+		install
 	else
 		$echo "\033[31m输入错误！已取消安装！\033[0m"
 		exit;
 	fi
 else
 	setdir
+	install
 fi

install_cdn.sh

@@ -1,144 +0,0 @@
-#! /bin/bash
-# Copyright (C) Juewuy
-
-echo='echo -e' && [ -n "$(ls -l /bin/sh|grep -o dash)" ] && echo=echo
-[ -z "$1" ] && test=0 || test=$1
-
-echo "***********************************************"
-echo "**                 欢迎使用                  **"
-echo "**                ShellClash                 **"
-echo "**                             by  Juewuy    **"
-echo "***********************************************"
-
-#检查root权限
-[ "$USER" != "root" ] && [ "$USER" != "admin" ] && echo 请使用root用户执行安装！&& exit 1
-
-#检查更新
-url="https://cdn.jsdelivr.net/gh/juewuy/ShellClash"
-if [ "$test" -gt 0 ];then 
-	url="--resolve raw.githubusercontent.com:443:199.232.68.133 https://raw.githubusercontent.com/juewuy/ShellClash/master"
-	[ "$test" -eq 2 ] && url="http://192.168.31.30:8080/clash-for-Miwifi" && echo $url
-	[ "$test" -eq 3 ] && url="http://192.168.123.90:8080/clash-for-Miwifi"
-else
-	release_new=$(curl -kfsSL --resolve api.github.com:443:140.82.113.5 "https://api.github.com/repos/juewuy/ShellClash/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')	#检查版本
-fi
-[ -z "$release_new" ] && release_new=$(curl -kfsSL $url/bin/version | grep "versionsh" | awk -F "=" '{print $2}')
-[ -z "$release_new" ] && echo "无法连接服务器！" && exit
-tarurl=$url@$release_new/bin/clashfm.tar.gz
-[ "$test" -gt 0 ] && tarurl=$url/bin/clashfm.tar.gz
-gettar(){
-	result=$(curl -w %{http_code} -kLo /tmp/clashfm.tar.gz $tarurl)
-	[ "$result" != "200" ] && echo "文件下载失败！" && exit 1
-	#解压
-	echo -----------------------------------------------
-	echo 开始解压文件！
-	mkdir -p $clashdir > /dev/null
-	tar -zxvf '/tmp/clashfm.tar.gz' -C $clashdir/
-	[ $? -ne 0 ] && echo "文件解压失败！" && exit 1 
-	#初始化文件目录
-	[ -f "$clashdir/mark" ] || echo '#标识clash运行状态的文件，不明勿动！' > $clashdir/mark
-	#判断系统类型写入不同的启动文件
-	if [ -f /etc/rc.common ];then
-			#设为init.d方式启动
-			mv $clashdir/clashservice /etc/init.d/clash
-			chmod  777 /etc/init.d/clash
-	else
-		[ -d /etc/systemd/system/ ] && sysdir=/etc/systemd/system/
-		[ -d /usr/lib/systemd/system/ ] && sysdir=/usr/lib/systemd/system/ 
-		if [ -n "$sysdir" ];then
-			#设为systemd方式启动
-			mv $clashdir/clash.service $sysdir/clash.service
-			sed -i "s%/etc/clash%$clashdir%g" $sysdir/clash.service
-			systemctl daemon-reload
-			rm -rf /etc/init.d/clash
-		else
-			#设为保守模式启动
-			sed -i '/start_old=*/'d $clashdir/mark
-			sed -i "1i\start_old=已开启" $clashdir/mark
-		fi
-	fi
-	#修饰文件及版本号
-	shtype=sh && [ -n "$(ls -l /bin/sh|grep -o dash)" ] && shtype=bash 
-	sed -i "s%#!/bin/sh%#!/bin/$shtype%g" $clashdir/start.sh
-	chmod  777 $clashdir/start.sh
-	sed -i '/versionsh_l=*/'d $clashdir/mark
-	sed -i "1i\versionsh_l=$release_new" $clashdir/mark
-	#设置环境变量
-	sed -i '/alias clash=*/'d /etc/profile
-	echo "alias clash=\"$shtype $clashdir/clash.sh\"" >> /etc/profile #设置快捷命令环境变量
-	sed -i '/export clashdir=*/'d /etc/profile
-	echo "export clashdir=\"$clashdir\"" >> /etc/profile #设置clash路径环境变量
-	#删除临时文件
-	rm -rf /tmp/clashfm.tar.gz 
-	rm -rf $clashdir/clashservice
-	rm -rf $clashdir/clash.service
-}
-#下载及安装
-install(){
-echo -----------------------------------------------
-echo 开始从服务器获取安装文件！
-echo -----------------------------------------------
-gettar
-echo -----------------------------------------------
-echo ShellClash 已经安装成功!
-echo -----------------------------------------------
-$echo "\033[33m输入\033[30;47m clash \033[0;33m命令即可管理！！！\033[0m"
-echo -----------------------------------------------
-}
-setdir(){		
-echo -----------------------------------------------		
-$echo "\033[32m 1 在默认目录(/etc)安装"
-$echo "\033[33m 2 手动设置安装目录"
-$echo "\033[0m 0 退出安装"
-echo -----------------------------------------------
-read -p "请输入相应数字 > " num
-#设置目录
-if [ -z $num ];then
-	echo 安装已取消
-	exit;
-elif [ "$num" = "1" ];then
-	dir=/etc
-elif [ "$num" = "2" ];then
-	echo -----------------------------------------------
-	echo '可用路径 剩余空间:'
-	df -h | awk '{print $6,$2}'| sed 1d 
-	echo '路径是必须带 / 的格式，写入虚拟内存(/tmp,/sys,..)的文件会在重启后消失！！！'
-	read -p "请输入自定义路径 > " dir
-	if [ -z "$dir" ];then
-		$echo "\033[31m路径错误！已取消安装！\033[0m"
-		exit;
-	fi
-else
-	echo 安装已取消！！！
-	exit;
-fi
-clashdir=$dir/clash
-install
-}
-
-#输出
-$echo "最新版本：\033[32m$release_new\033[0m"
-echo -----------------------------------------------
-$echo "\033[44m如遇问题请加TG群反馈：\033[42;30m t.me/clashfm \033[0m"
-$echo "\033[37m支持各种基于openwrt的路由器设备"
-$echo "\033[33m支持Debian、Centos等标准Linux系统\033[0m"
-
-if [ -n "$clashdir" ];then
-	echo -----------------------------------------------
-	$echo "检测到旧的安装目录\033[36m$clashdir\033[0m，是否覆盖安装？"
-	$echo "\033[32m覆盖安装时不会移除配置文件！\033[0m"
-	read -p "覆盖安装/卸载旧版本？(1/0) > " res
-	if [ "$res" = "1" ];then
-		install
-	elif [ "$res" = "0" ];then
-		rm -rf $clashdir
-		echo -----------------------------------------------
-		$echo "\033[31m 旧版本文件已卸载！\033[0m"
-		setdir
-	else
-		$echo "\033[31m输入错误！已取消安装！\033[0m"
-		exit;
-	fi
-else
-	setdir
-fi

scripts/clashservice

@@ -5,15 +5,21 @@ START=92
 SERVICE_DAEMONIZE=1
 SERVICE_WRITE_PID=1
 USE_PROCD=1
-DIR=$(cat /etc/profile|grep clashdir|awk -F "\"" '{print $2}')
+#获取目录
+DIR=$(cat /etc/profile | grep clashdir | awk -F "\"" '{print $2}')
+[ -z "$DIR" ] && DIR=$(cat ~/.bashrc | grep clashdir | awk -F "\"" '{print $2}')
+BINDIR=$(cat $DIR/mark | grep bindir | awk -F "=" '{print $2}')
+[ -z "$BINDIR" ] && BINDIR=$DIR
 
 start_service() {
+	#检测必须文件
+	$DIR/start.sh bfstart
 	#使用procd创建clash后台进程
 	procd_open_instance
 	procd_set_param respawn
 	procd_set_param stderr 1
 	procd_set_param stdout 1
-	procd_set_param command $DIR/clash -d $DIR
+	procd_set_param command $BINDIR/clash -d $BINDIR
 	procd_close_instance
 	#其他设置
 	$DIR/start.sh afstart
@@ -21,12 +27,14 @@ start_service() {
 
 start() {
 	if [ -z "$(pidof procd)" ];then
+		#检测必须文件
+		$DIR/start.sh bfstart
 		#创建后台进程
-		service_start  $DIR/clash -d $DIR
-		#设置守护进程
-		$DIR/start.sh deamon
+		service_start  $BINDIR/clash -d $BINDIR
 		#其他设置
 		$DIR/start.sh afstart
+		#设置守护进程
+		$DIR/start.sh deamon
 	else
 		start_service
 	fi

scripts/start.sh

@@ -1,39 +1,107 @@
 #!/bin/sh
 # Copyright (C) Juewuy
 
+#脚本内部工具
 getconfig(){
-#加载环境变量
-[ -z "$clashdir" ] && source /etc/profile > /dev/null 2>&1
-ccfg=$clashdir/mark
-#检查/读取标识文件
-[ ! -f $ccfg ]&& echo '#标识clash运行状态的文件，不明勿动！' >> $ccfg
-source $ccfg
-#默认设置
-[ -z "$skip_cert" ] && skip_cert=已开启
-[ -z "$common_ports" ] && common_ports=已开启
-[ -z "$dns_mod" ] && dns_mod=redir_host
-[ -z "$dns_over" ] && dns_over=已开启
-[ -z "$modify_yaml" ] && modify_yaml=未开启
-[ -z "$ipv6_support" ] && ipv6_support=未开启
-[ -z "$start_old" ] && start_old=未开启
-[ -z "$local_proxy" ] && local_proxy=未开启
-[ -z "$mix_port" ] && mix_port=7890
-[ -z "$redir_port" ] && redir_port=7892
-[ -z "$db_port" ] && db_port=9999
-[ -z "$dns_port" ] && dns_port=1053
-#是否代理常用端口
-[ "$common_ports" = "已开启" ] && ports='-m multiport --dports 22,53,587,465,995,993,143,80,443 '
+	#加载配置文件
+	[ -z "$clashdir" ] && clashdir=$(cat /etc/profile | grep clashdir | awk -F "\"" '{print $2}')
+	[ -z "$clashdir" ] && clashdir=$(cat ~/.bashrc | grep clashdir | awk -F "\"" '{print $2}')
+	ccfg=$clashdir/mark
+	[ -f $ccfg ] && source $ccfg
+	#默认设置
+	[ -z "$bindir" ] && bindir=$clashdir
+	[ -z "$redir_mod" ] && [ "$USER" = "root" -o "$USER" = "admin" ] && redir_mod=Redir模式
+	[ -z "$redir_mod" ] && redir_mod=Redir模式
+	[ -z "$skip_cert" ] && skip_cert=已开启
+	[ -z "$common_ports" ] && common_ports=已开启
+	[ -z "$dns_mod" ] && dns_mod=redir_host
+	[ -z "$dns_over" ] && dns_over=已开启
+	[ -z "$modify_yaml" ] && modify_yaml=未开启
+	[ -z "$ipv6_support" ] && ipv6_support=未开启
+	[ -z "$start_old" ] && start_old=未开启
+	[ -z "$local_proxy" ] && local_proxy=未开启
+	[ -z "$mix_port" ] && mix_port=7890
+	[ -z "$redir_port" ] && redir_port=7892
+	[ -z "$db_port" ] && db_port=9999
+	[ -z "$dns_port" ] && dns_port=1053
+	[ -z "$dns_nameserver" ] && dns_nameserver='114.114.114.114, 223.5.5.5'
+	[ -z "$dns_fallback" ] && dns_fallback='1.0.0.1, 8.8.4.4'
+	[ -z "$multiport" ] && multiport='53,587,465,995,993,143,80,443'
+	#是否代理常用端口
+	[ "$common_ports" = "已开启" ] && ports="-m multiport --dports $multiport"
+	}
+setconfig(){
+	#参数1代表变量名，参数2代表变量值,参数3即文件路径
+	[ -z "$3" ] && configpath=$clashdir/mark || configpath=$3
+	[ -n "$(grep ${1} $configpath)" ] && sed -i "s#${1}=.*#${1}=${2}#g" $configpath || echo "${1}=${2}" >> $configpath
 }
+compare(){
+	if [ ! -f $1 -o ! -f $2 ];then
+		return 1
+	elif command -v cmp >/dev/null 2>&1;then
+		cmp -s $1 $2
+	else
+		[ "$(cat $1)" = "$(cat $2)" ] && return 0 || return 1
+	fi
+}
+webget(){
+	[ -n "$(pidof clash)" ] && export all_proxy="http://$authentication@127.0.0.1:$mix_port" #设置临时http代理 
+	#参数【$1】代表下载目录，【$2】代表在线地址
+	#参数【$3】代表输出显示，【$4】不启用重定向
+	#参数【$5】代表验证证书
+	if curl --version > /dev/null 2>&1;then
+		[ "$3" = "echooff" ] && progress='-s' || progress='-#'
+		[ "$4" = "rediroff" ] && redirect='' || redirect='-L'
+		[ "$5" = "skipceroff" ] && certificate='' || certificate='-k'
+		result=$(curl -w %{http_code} --connect-timeout 3 $progress $redirect $certificate -o $1 $2)
+		[ "$result" != "200" ] && export all_proxy="" && result=$(curl -w %{http_code} --connect-timeout 3 $progress $redirect $certificate -o $1 $2)
+	else
+		[ "$3" = "echooff" ] && progress='-q' || progress='-q --show-progress'
+		[ "$3" = "echoon" ] && progress=''
+		[ "$4" = "rediroff" ] && redirect='--max-redirect=0' || redirect=''
+		[ "$5" = "skipceroff" ] && certificate='' || certificate='--no-check-certificate'
+		wget -Y on $progress $redirect $certificate --timeout=3 -O $1 $2 
+		if [ "$?" != "0" ];then
+			wget $progress $redirect $certificate --timeout=3 -O $1 $2
+			[ "$?" = "0" ] && result="200"
+		else
+			result="200"
+		fi
+	fi
+	export all_proxy=""
+}
+logger(){
+	[ -n "$2" ] && echo -e "\033[$2m$1\033[0m"
+	echo `date "+%G-%m-%d %H:%M:%S"` $1 >> $clashdir/log
+	[ "$(wc -l $clashdir/log | awk '{print $1}')" -gt 30 ] && sed -i '1,5d' $clashdir/log
+}
+cronset(){
+	# 参数1代表要移除的关键字,参数2代表要添加的任务语句
+	crondir=/tmp/cron_$USER
+	crontab -l > $crondir
+	sed -i "/$1/d" $crondir
+	echo "$2" >> $crondir
+	crontab $crondir
+	rm -f $crondir
+}
+mark_time(){
+	start_time=`date +%s`
+	sed -i '/start_time*/'d $clashdir/mark
+	echo start_time=$start_time >> $clashdir/mark
+}
+#配置文件相关
 getyaml(){
-#前后端订阅服务器地址索引，可在此处添加！
-Server=`sed -n ""$server_link"p"<<EOF
+	[ -z "$rule_link" ] && rule_link=1
+	[ -z "$server_link" ] && server_link=1
+	#前后端订阅服务器地址索引，可在此处添加！
+	Server=`sed -n ""$server_link"p"<<EOF
 subcon.dlj.tf
 subconverter.herokuapp.com
-subcon.py6.pw
+subconverter-web.now.sh
 api.dler.io
 api.wcc.best
 EOF`
-Config=`sed -n ""$rule_link"p"<<EOF
+	Config=`sed -n ""$rule_link"p"<<EOF
 https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_NoReject.ini
 https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Mini_MultiMode.ini
 https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_AdblockPlus.ini
@@ -48,157 +116,171 @@ https://gist.githubusercontent.com/tindy2013/1fa08640a9088ac8652dbd40c5d2715b/ra
 https://subconverter.oss-ap-southeast-1.aliyuncs.com/Rules/RemoteConfig/special/basic.ini
 https://subconverter.oss-ap-southeast-1.aliyuncs.com/Rules/RemoteConfig/special/netease.ini
 EOF`
-#如果传来的是Url链接则合成Https链接，否则直接使用Https链接
-if [ -z "$Https" ];then
-	#echo $Url
-	Https="https://$Server/sub?target=clash&insert=true&new_name=true&scv=true&exclude=$exclude&include=$include&url=$Url&config=$Config"
-	markhttp=1
-fi
-#
-echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-echo 正在连接服务器获取配置文件…………链接地址为：
-echo -e "\033[4;32m$Https\033[0m"
-echo 可以手动复制该链接到浏览器打开并查看数据是否正常！
-echo -e "\033[36m~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-echo -e "|                                             |"
-echo -e "|         需要一点时间，请耐心等待！          |"
-echo -e "|       \033[0m如长时间没有数据请用ctrl+c退出\033[36m        |"
-echo -e "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\033[0m"
-#获取在线yaml文件
-yaml=$clashdir/config.yaml
-yamlnew=/tmp/config.yaml
-rm -rf $yamlnew > /dev/null 2>&1
-result=$(curl -w %{http_code} -kLo $yamlnew $Https)
-if [ "$result" != "200" ];then
-	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	echo -e "\033[31m配置文件获取失败！\033[0m"
-	if [ -z "$markhttp" ];then
-		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		echo -e "\033[31m请尝试使用【导入节点/链接】功能！\033[0m"
-		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		exit 1
-	else
-		if [ "$retry" -ge 5 ];then
-			echo -e "\033[32m无法获取配置文件，请检查链接格式以及网络连接状态！\033[0m"
+	#如果传来的是Url链接则合成Https链接，否则直接使用Https链接
+	if [ -z "$Https" ];then
+		Https="https://$Server/sub?target=clash&insert=true&new_name=true&scv=true&exclude=$exclude&include=$include&url=$Url&config=$Config"
+		markhttp=1
+	fi
+	#输出
+	echo -----------------------------------------------
+	echo 正在连接服务器获取配置文件…………链接地址为：
+	echo -e "\033[4;32m$Https\033[0m"
+	echo 可以手动复制该链接到浏览器打开并查看数据是否正常！
+	#获取在线yaml文件
+	yaml=$clashdir/config.yaml
+	yamlnew=/tmp/clash_config_$USER.yaml
+	rm -rf $yamlnew
+	webget $yamlnew $Https
+	if [ "$result" != "200" ];then
+		if [ -z "$markhttp" ];then
+			echo -----------------------------------------------
+			logger "配置文件获取失败！" 31
+			echo -e "\033[31m请尝试使用【导入订阅】功能！\033[0m"
+			echo -----------------------------------------------
 			exit 1
 		else
-			retry=$((retry+1))
-			echo -e "\033[32m尝试使用其他服务器获取配置！\033[0m"
-			echo -e "\033[33m正在尝试第$retry次/共5次！\033[0m"
-			sed -i '/server_link=*/'d $ccfg
-			if [ "$server_link" -ge 5 ]; then
-				server_link=0
+			if [ "$retry" -ge 5 ];then
+				logger "无法获取配置文件，请检查链接格式以及网络连接状态！" 31
+				exit 1
+			else
+				retry=$((retry+1))
+				logger "配置文件获取失败！" 31
+				echo -e "\033[32m尝试使用其他服务器获取配置！\033[0m"
+				logger "正在重试第$retry次/共5次！" 32
+				sed -i '/server_link=*/'d $ccfg
+				if [ "$server_link" -ge 5 ]; then
+					server_link=0
+				fi
+				server_link=$((server_link+1))
+				echo server_link=$server_link >> $ccfg
+				Https=""
+				getyaml
 			fi
-			server_link=$((server_link+1))
-			sed -i "1i\server_link=$server_link" $ccfg
-			Https=""
-			getyaml
 		fi
-	fi
-else
-	Https=""
-	#检测节点
-	if [ -z "$(cat $yamlnew | grep 'server:' | grep -v 'nameserver')" ];then
-		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		echo -e "\033[33m获取到了配置文件，但似乎并不包含正确的节点信息！\033[0m"
-		echo -----------------------------------------------
-		sed -n '1,30p' $yamlnew
-		echo -----------------------------------------------
-		echo -e "\033[33m请检查如上配置文件信息:\033[0m"
-		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		exit 1
-	fi
-	#检测旧格式
-	if cat $yamlnew | grep 'Proxy Group:' >/dev/null;then
-		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		echo -e "\033[31m已经停止对旧格式配置文件的支持！！！\033[0m"
-		echo -e "请使用新格式或者使用【导入节点/链接】功能！"
-		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		exit 1
-	fi
-	#检测不支持的加密协议
-	if cat $yamlnew | grep 'cipher: chacha20,' >/dev/null;then
-		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		echo -e "\033[31m不支持chacha20加密，请更换节点加密协议！！！\033[0m"
-		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		exit 1
-	fi
-	#替换文件
-	[ -f $yaml ] && mv $yaml $yaml.bak
-	mv $yamlnew $yaml
-	echo 配置文件已生成！正在启动clash使其生效！
-	#重启clash服务
-	$0 stop
-	$0 start
-	sleep 1
-	if [ -z "$(pidof clash)" ];then
-		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		if [ -f $yaml.bak ];then
-			$clashdir/start.sh stop
-			mv $yaml.bak $yaml
-			$0 start
-			echo -e "\033[31mclash服务启动失败！已还原配置文件并重启clash！\033[0m"
-			sleep 1
-			[ -n "$(pidof clash)" ] && exit 0
+	else
+		Https=""
+		#检测节点或providers
+		if [ -z "$(cat $yamlnew | grep -E 'server:|proxy-providers:' | grep -v 'nameserver')" ];then
+			echo -----------------------------------------------
+			logger "获取到了配置文件，但似乎并不包含正确的节点信息！" 31
+			echo -----------------------------------------------
+			sed -n '1,30p' $yamlnew
+			echo -----------------------------------------------
+			echo -e "\033[33m请检查如上配置文件信息:\033[0m"
+			echo -----------------------------------------------
+			exit 1
 		fi
-		echo -e "\033[31mclash服务启动失败！请查看报错信息！\033[0m"
-		$0 stop
-		$clashdir/clash -t -d $clashdir
-		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		exit 1
+		#检测旧格式
+		if cat $yamlnew | grep 'Proxy Group:' >/dev/null;then
+			echo -----------------------------------------------
+			logger "已经停止对旧格式配置文件的支持！！！" 31
+			echo -e "请使用新格式或者使用【导入节点/链接】功能！"
+			echo -----------------------------------------------
+			exit 1
+		fi
+		#检测不支持的加密协议
+		if cat $yamlnew | grep 'cipher: chacha20,' >/dev/null;then
+			echo -----------------------------------------------
+			logger "已停止支持chacha20加密，请更换更安全的节点加密协议！" 31
+			echo -----------------------------------------------
+			exit 1
+		fi
+		#检测是否存在高级版规则
+		if [ "$clashcore" = "clash" -a -n "$(cat $yamlnew | grep -E '^script:|proxy-providers|rule-providers')" ];then
+			echo -----------------------------------------------
+			logger "检测到高级版核心专属规则！将改为使用premium核心启动！" 33
+			rm -rf $bindir/clash
+			setconfig clashcore clashpre
+			echo -----------------------------------------------
+		fi
+		#使用核心内置test功能检测
+		if [ -x $bindir/clash ];then
+			$bindir/clash -t -d $bindir -f $yamlnew >/dev/null
+			if [ "$?" != "0" ];then
+				logger "配置文件加载失败！请查看报错信息！" 31
+				$bindir/clash -t -d $bindir -f $yamlnew
+				echo "$($bindir/clash -t -d $bindir -f $yamlnew)" >> $clashdir/log
+				exit 1
+			fi
+		fi
+		#如果不同则备份并替换文件
+		if [ -f $yaml ];then
+			compare $yamlnew $yaml
+			[ "$?" = 0 ] || mv -f $yaml $yaml.bak && mv -f $yamlnew $yaml
+		else
+			mv -f $yamlnew $yaml
+		fi
+		echo -e "\033[32m已成功获取配置文件！\033[0m"
+		rm -rf $yamlnew
+		exit 0
 	fi
-fi
 }
 modify_yaml(){
 ##########需要变更的配置###########
-lan='allow-lan: true'
-mode='mode: Rule'
-log='log-level: info'
-[ "$ipv6_support" = "已开启" ] && ipv6='ipv6: true' || ipv6='ipv6: false'
-external="external-controller: 0.0.0.0:$db_port"
-[ -d $clashdir/ui ] && db_ui=ui
-[ "$redir_mod" != "Redir模式" ] && tun='tun: {enable: true, stack: system}' || tun='tun: {enable: false}'
-exper='experimental: {ignore-resolve-fail: true, interface-name: en0}'
-#dns配置
-if [ "$dns_mod" = "fake-ip" ];then
-	dns='dns: {enable: true, listen: 0.0.0.0:'$dns_port', use-hosts: true, fake-ip-range: 198.18.0.1/16, enhanced-mode: fake-ip, fake-ip-filter: ["*.lan", "time.windows.com", "time.nist.gov", "time.apple.com", "time.asia.apple.com", "*.ntp.org.cn", "*.openwrt.pool.ntp.org", "time1.cloud.tencent.com", "time.ustc.edu.cn", "pool.ntp.org", "ntp.ubuntu.com", "ntp.aliyun.com", "ntp1.aliyun.com", "ntp2.aliyun.com", "ntp3.aliyun.com", "ntp4.aliyun.com", "ntp5.aliyun.com", "ntp6.aliyun.com", "ntp7.aliyun.com", "time1.aliyun.com", "time2.aliyun.com", "time3.aliyun.com", "time4.aliyun.com", "time5.aliyun.com", "time6.aliyun.com", "time7.aliyun.com", "*.time.edu.cn", "time1.apple.com", "time2.apple.com", "time3.apple.com", "time4.apple.com", "time5.apple.com", "time6.apple.com", "time7.apple.com", "time1.google.com", "time2.google.com", "time3.google.com", "time4.google.com", "music.163.com", "*.music.163.com", "*.126.net", "musicapi.taihe.com", "music.taihe.com", "songsearch.kugou.com", "trackercdn.kugou.com", "*.kuwo.cn", "api-jooxtt.sanook.com", "api.joox.com", "joox.com", "y.qq.com", "*.y.qq.com", "streamoc.music.tc.qq.com", "mobileoc.music.tc.qq.com", "isure.stream.qqmusic.qq.com", "dl.stream.qqmusic.qq.com", "aqqmusic.tc.qq.com", "amobile.music.tc.qq.com", "*.xiami.com", "*.music.migu.cn", "music.migu.cn", "*.msftconnecttest.com", "*.msftncsi.com", "localhost.ptlogin2.qq.com", "*.*.*.srv.nintendo.net", "*.*.stun.playstation.net", "xbox.*.*.microsoft.com", "*.*.xboxlive.com", "proxy.golang.org"], nameserver: [114.114.114.114, 223.5.5.5, 127.0.0.1:53], fallback: [tcp://1.0.0.1, 8.8.4.4], fallback-filter: {geoip: true}}'
-elif [ "$dns_over" = "已开启" ];then
-	dns='dns: {enable: true, ipv6: true, listen: 0.0.0.0:'$dns_port', use-hosts: true, enhanced-mode: redir-host, nameserver: [114.114.114.114, 223.5.5.5], fallback: [1.0.0.1, 8.8.4.4], fallback-filter: {geoip: true}}'
-else
-	dns='dns: {enable: true, ipv6: true, listen: 0.0.0.0:'$dns_port', use-hosts: true, enhanced-mode: redir-host, nameserver: [114.114.114.114, 223.5.5.5, 127.0.0.1:53], fallback: [1.0.0.1, 8.8.4.4], fallback-filter: {geoip: true}}'
-fi
-
-###################################
-	yaml=$clashdir/config.yaml
-	#预删除需要添加的项目
-	i=$(grep  -n  "^proxies:" $clashdir/config.yaml | head -1 | cut -d ":" -f 1)
-	i=$((i-1))
-	sed -i "1,${i}d" $yaml
-	#添加配置
-	sed -i "1imixed-port:\ $mix_port" $yaml
-	sed -i "1aredir-port:\ $redir_port" $yaml
-	sed -i "2a$lan" $yaml
-	sed -i "3a$mode" $yaml
-	sed -i "4a$log" $yaml
-	sed -i "5a$ipv6" $yaml
-	sed -i "6aexternal-controller:\ :$db_port" $yaml
-	sed -i "7aexternal-ui:\ $db_ui" $yaml
-	sed -i "8asecret:\ $secret" $yaml
-	sed -i "9a$dns" $yaml
-	sed -i "10a$tun" $yaml
-	sed -i "11a$exper" $yaml
-	#跳过本地tls证书验证
-	if [ "$skip_cert" = "已开启" ];then
-	sed -i '10,99s/skip-cert-verify: false/skip-cert-verify: true/' $yaml
+	lan='allow-lan: true'
+	mode='mode: Rule'
+	log='log-level: info'
+	[ "$ipv6_support" = "已开启" ] && ipv6='ipv6: true' || ipv6='ipv6: false'
+	external="external-controller: 0.0.0.0:$db_port"
+	[ -d $clashdir/ui ] && db_ui=ui
+	[ "$redir_mod" != "Redir模式" ] && tun='tun: {enable: true, stack: system}' || tun='tun: {enable: false}'
+	exper='experimental: {ignore-resolve-fail: true, interface-name: en0}'
+	#dns配置
+	if [ "$dns_mod" = "fake-ip" ];then
+		dns='dns: {enable: true, listen: 0.0.0.0:'$dns_port', use-hosts: true, fake-ip-range: 198.18.0.1/16, enhanced-mode: fake-ip, fake-ip-filter: ["*.lan", "time.windows.com", "time.nist.gov", "time.apple.com", "time.asia.apple.com", "*.ntp.org.cn", "*.openwrt.pool.ntp.org", "time1.cloud.tencent.com", "time.ustc.edu.cn", "pool.ntp.org", "ntp.ubuntu.com", "ntp.aliyun.com", "ntp1.aliyun.com", "ntp2.aliyun.com", "ntp3.aliyun.com", "ntp4.aliyun.com", "ntp5.aliyun.com", "ntp6.aliyun.com", "ntp7.aliyun.com", "time1.aliyun.com", "time2.aliyun.com", "time3.aliyun.com", "time4.aliyun.com", "time5.aliyun.com", "time6.aliyun.com", "time7.aliyun.com", "*.time.edu.cn", "time1.apple.com", "time2.apple.com", "time3.apple.com", "time4.apple.com", "time5.apple.com", "time6.apple.com", "time7.apple.com", "time1.google.com", "time2.google.com", "time3.google.com", "time4.google.com", "music.163.com", "*.music.163.com", "*.126.net", "musicapi.taihe.com", "music.taihe.com", "songsearch.kugou.com", "trackercdn.kugou.com", "*.kuwo.cn", "api-jooxtt.sanook.com", "api.joox.com", "joox.com", "y.qq.com", "*.y.qq.com", "streamoc.music.tc.qq.com", "mobileoc.music.tc.qq.com", "isure.stream.qqmusic.qq.com", "dl.stream.qqmusic.qq.com", "aqqmusic.tc.qq.com", "amobile.music.tc.qq.com", "*.xiami.com", "*.music.migu.cn", "music.migu.cn", "*.msftconnecttest.com", "*.msftncsi.com", "localhost.ptlogin2.qq.com", "*.*.*.srv.nintendo.net", "*.*.stun.playstation.net", "xbox.*.*.microsoft.com", "*.*.xboxlive.com", "proxy.golang.org"], nameserver: ['$dns_nameserver', 127.0.0.1:53], fallback: ['$dns_fallback'], fallback-filter: {geoip: true}}'
 	else
-	sed -i '10,99s/skip-cert-verify: true/skip-cert-verify: false/' $yaml
+		dns='dns: {enable: true, ipv6: true, listen: 0.0.0.0:'$dns_port', use-hosts: true, enhanced-mode: redir-host, nameserver: ['$dns_nameserver$dns_local'], fallback: ['$dns_fallback'], fallback-filter: {geoip: true}}'
 	fi
+	#设置目录
+	yaml=$clashdir/config.yaml
+	tmpdir=/tmp/clash_$USER
+	#预删除需要添加的项目
+	a=$(grep -n "port:" $yaml | head -1 | cut -d ":" -f 1)
+	b=$(grep -n "^prox" $yaml | head -1 | cut -d ":" -f 1)
+	b=$((b-1))
+	mkdir -p $tmpdir > /dev/null
+	sed "${a},${b}d" $yaml > $tmpdir/proxy.yaml
+	#跳过本地tls证书验证
+	[ "$skip_cert" = "已开启" ] && sed -i '10,99s/skip-cert-verify: false/skip-cert-verify: true/' $tmpdir/proxy.yaml
+	#添加配置
+###################################
+	cat > $tmpdir/set.yaml <<EOF
+mixed-port: $mix_port
+redir-port: $redir_port
+authentication: ["$authentication"]
+$lan
+$mode
+$log
+$ipv6
+external-controller: :$db_port
+external-ui: $db_ui
+secret: $secret
+$tun
+$exper
+$dns
+EOF
+###################################
+	[ -f $clashdir/user.yaml ] && yaml_user=$clashdir/user.yaml
+	#合并文件
+	cut -c 1- $tmpdir/set.yaml $yaml_user $tmpdir/proxy.yaml > $tmpdir/config.yaml
+	#插入自定义规则
+	if [ -f $clashdir/rules.yaml ];then
+		while read line;do
+			[ -z "$(echo "$line" | grep '#')" ] && \
+			[ -n "$(echo "$line" | grep '\-\ ')" ] && \
+			sed -i "/$line/d" $tmpdir/config.yaml && \
+			sed -i "/^rules:/a\ $line" $tmpdir/config.yaml
+		done < $clashdir/rules.yaml
+	fi
+	#如果没有使用小闪存模式
+	if [ "$tmpdir" != "$bindir" ];then
+		compare $tmpdir/config.yaml $yaml
+		[ "$?" != 0 ] && mv -f $tmpdir/config.yaml $yaml || rm -f $tmpdir/config.yaml
+	fi
+	rm -f $tmpdir/set.yaml
+	rm -f $tmpdir/proxy.yaml
 }
-mark_time(){
-	start_time=`date +%s`
-	sed -i '/start_time*/'d $clashdir/mark
-	sed -i "1i\start_time=$start_time" $clashdir/mark
-}
+#设置路由规则
 start_redir(){
 	#流量过滤规则
 	iptables -t nat -N clash
@@ -210,42 +292,38 @@ start_redir(){
 	iptables -t nat -A clash -d 192.168.0.0/16 -j RETURN
 	iptables -t nat -A clash -d 224.0.0.0/4 -j RETURN
 	iptables -t nat -A clash -d 240.0.0.0/4 -j RETURN
-	for mac in $(cat $clashdir/mac); do
-		iptables -t nat -A clash -m mac --mac-source $mac -j RETURN
-	done
-	#设置防火墙流量转发
-	iptables -t nat -A clash -p tcp $ports-j REDIRECT --to-ports $redir_port
+	if [ "$macfilter_type" = "白名单" -a -n "$(cat $clashdir/mac)" ];then
+		#mac白名单
+		for mac in $(cat $clashdir/mac); do
+			iptables -t nat -A clash -p tcp $ports -m mac --mac-source $mac -j REDIRECT --to-ports $redir_port
+		done
+	else
+		#mac黑名单
+		for mac in $(cat $clashdir/mac); do
+			iptables -t nat -A clash -m mac --mac-source $mac -j RETURN
+		done
+		iptables -t nat -A clash -p tcp $ports -j REDIRECT --to-ports $redir_port
+	fi
 	iptables -t nat -A PREROUTING -p tcp -j clash
 	#设置ipv6转发
-	if [ -n "ip6_nat" -a "$ipv6_support" = "已开启" ];then
+	ip6_nat=$(ip6tables -t nat -L 2>&1 | grep -o 'Chain')
+	if [ -n "$ip6_nat" -a "$ipv6_support" = "已开启" ];then
 		ip6tables -t nat -N clashv6
-		for mac in $(cat $clashdir/mac); do
-			ip6tables -t nat -A clashv6 -m mac --mac-source $mac -j RETURN
-		done
-		ip6tables -t nat -A clashv6 -p tcp $ports-j REDIRECT --to-ports $redir_port
+		if [ "$macfilter_type" = "白名单" -a -n "$(cat $clashdir/mac)" ];then
+			#mac白名单
+			for mac in $(cat $clashdir/mac); do
+				ip6tables -t nat -A clashv6 -p tcp $ports -m mac --mac-source $mac -j REDIRECT --to-ports $redir_port
+			done
+		else
+			#mac黑名单
+			for mac in $(cat $clashdir/mac); do
+				ip6tables -t nat -A clashv6 -m mac --mac-source $mac -j RETURN
+			done
+			ip6tables -t nat -A clashv6 -p tcp $ports -j REDIRECT --to-ports $redir_port
+		fi
 		ip6tables -t nat -A PREROUTING -p tcp -j clashv6
 	fi
 }
-stop_iptables(){
-    #重置iptables规则
-	iptables -t nat -D PREROUTING -p tcp -j clash > /dev/null 2>&1
-	iptables -t nat -D PREROUTING -p udp -j clash_dns > /dev/null 2>&1
-	iptables -t nat -D PREROUTING -p tcp -d 8.8.8.8 -j clash_dns > /dev/null 2>&1
-	iptables -t nat -D PREROUTING -p tcp -d 8.8.4.4 -j clash_dns > /dev/null 2>&1
-	iptables -t nat -F clash > /dev/null 2>&1
-	iptables -t nat -X clash > /dev/null 2>&1
-	iptables -t nat -F clash_dns > /dev/null 2>&1
-	iptables -t nat -X clash_dns > /dev/null 2>&1
-	iptables -D FORWARD -o utun -j ACCEPT > /dev/null 2>&1
-	#重置ipv6规则
-	ip6tables -t nat -D PREROUTING -p tcp -j clashv6 > /dev/null 2>&1
-	ip6tables -t nat -D PREROUTING -p udp -j clashv6_dns > /dev/null 2>&1
-	ip6tables -t nat -F clashv6 > /dev/null 2>&1
-	ip6tables -t nat -X clashv6 > /dev/null 2>&1
-	ip6tables -t nat -F clashv6_dns > /dev/null 2>&1
-	ip6tables -t nat -X clashv6_dns > /dev/null 2>&1
-	ip6tables -D FORWARD -o utun -j ACCEPT > /dev/null 2>&1
-}
 start_dns(){
 	#允许tun网卡接受流量
 	if [ "$redir_mod" = "Tun模式" -o "$redir_mod" = "混合模式" ];then
@@ -254,55 +332,145 @@ start_dns(){
 	fi
 	#设置dns转发
 	iptables -t nat -N clash_dns
-	for mac in $(cat $clashdir/mac); do
-		iptables -t nat -A clash_dns -m mac --mac-source $mac -j RETURN
-	done
-	iptables -t nat -A clash_dns -p udp --dport 53 -j REDIRECT --to $dns_port
-	iptables -t nat -A clash_dns -p tcp --dport 53 -j REDIRECT --to $dns_port
+	if [ "$macfilter_type" = "白名单" -a -n "$(cat $clashdir/mac)" ];then
+		#mac白名单
+		for mac in $(cat $clashdir/mac); do
+			iptables -t nat -A clash_dns -p udp --dport 53 -m mac --mac-source $mac -j REDIRECT --to $dns_port
+			iptables -t nat -A clash_dns -p tcp --dport 53 -m mac --mac-source $mac -j REDIRECT --to $dns_port
+		done
+	else
+		#mac黑名单
+		for mac in $(cat $clashdir/mac); do
+			iptables -t nat -A clash_dns -m mac --mac-source $mac -j RETURN
+		done	
+		iptables -t nat -A clash_dns -p udp --dport 53 -j REDIRECT --to $dns_port
+		iptables -t nat -A clash_dns -p tcp --dport 53 -j REDIRECT --to $dns_port
+	fi
 	iptables -t nat -A PREROUTING -p udp -j clash_dns
 	#Google home DNS特殊处理
 	iptables -t nat -I PREROUTING -p tcp -d 8.8.8.8 -j clash_dns
 	iptables -t nat -I PREROUTING -p tcp -d 8.8.4.4 -j clash_dns
 	#ipv6DNS
-	ip6_nat=$(ip6tables -t nat -L 2>&1|grep -o 'Chain')
-	if [ -n "ip6_nat" ];then
+	ip6_nat=$(ip6tables -t nat -L 2>&1 | grep -o 'Chain')
+	if [ -n "$ip6_nat" ];then
 		ip6tables -t nat -N clashv6_dns > /dev/null 2>&1
+		if [ "$macfilter_type" = "白名单" -a -n "$(cat $clashdir/mac)" ];then
+			#mac白名单
+			for mac in $(cat $clashdir/mac); do
+				ip6tables -t nat -A clashv6_dns -p udp --dport 53 -m mac --mac-source $mac -j REDIRECT --to $dns_port
+				ip6tables -t nat -A clashv6_dns -p tcp --dport 53 -m mac --mac-source $mac -j REDIRECT --to $dns_port
+			done
+		else
+			#mac黑名单
+			for mac in $(cat $clashdir/mac); do
+				ip6tables -t nat -A clashv6_dns -m mac --mac-source $mac -j RETURN
+			done	
+			ip6tables -t nat -A clashv6_dns -p udp --dport 53 -j REDIRECT --to $dns_port
+			ip6tables -t nat -A clashv6_dns -p tcp --dport 53 -j REDIRECT --to $dns_port
+		fi
+		ip6tables -t nat -A PREROUTING -p udp -j clashv6_dns
+	else
+		ip6tables -I INPUT -p tcp --dport 53 -j REJECT > /dev/null 2>&1
+		ip6tables -I INPUT -p udp --dport 53 -j REJECT > /dev/null 2>&1
+	fi
+}
+start_udp(){
+	ip rule add fwmark 1 table 100
+	ip route add local default dev lo table 100
+	iptables -t mangle -N clash
+	iptables -t mangle -A clash -d 0.0.0.0/8 -j RETURN
+	iptables -t mangle -A clash -d 10.0.0.0/8 -j RETURN
+	iptables -t mangle -A clash -d 127.0.0.0/8 -j RETURN
+	iptables -t mangle -A clash -d 169.254.0.0/16 -j RETURN
+	iptables -t mangle -A clash -d 172.16.0.0/12 -j RETURN
+	iptables -t mangle -A clash -d 192.168.0.0/16 -j RETURN
+	iptables -t mangle -A clash -d 224.0.0.0/4 -j RETURN
+	iptables -t mangle -A clash -d 240.0.0.0/4 -j RETURN
+	if [ "$macfilter_type" = "白名单" -a -n "$(cat $clashdir/mac)" ];then
+		#mac白名单
 		for mac in $(cat $clashdir/mac); do
-			ip6tables -t nat -A clashv6_dns -m mac --mac-source $mac -j RETURN > /dev/null 2>&1
+			iptables -t mangle -A clash -p udp -m mac --mac-source $mac -j TPROXY --on-port $redir_port --tproxy-mark 1
 		done
-		ip6tables -t nat -A clashv6_dns -p udp --dport 53 -j REDIRECT --to $dns_port > /dev/null 2>&1
-		ip6tables -t nat -A PREROUTING -p udp -j clashv6_dns > /dev/null 2>&1
 	else
-		 ip6tables -I INPUT -p tcp --dport 53 -j REJECT
-		 ip6tables -I INPUT -p udp --dport 53 -j REJECT
+		#mac黑名单
+		for mac in $(cat $clashdir/mac); do
+			iptables -t mangle -A clash -m mac --mac-source $mac -j RETURN
+		done
+		iptables -t mangle -A clash -p udp -j TPROXY --on-port $redir_port --tproxy-mark 1
 	fi
+	iptables -t mangle -A PREROUTING -p udp -j clash
 }
-daemon(){
-	if [ -n "$cronpath" ];then
-		echo '*/1 * * * * test -z "$(pidof clash)"  &&  /etc/init.d/clash restart #clash保守模式守护进程' >> $cronpath
-		chmod 600 $cronpath
-	else
-		echo 找不到定时任务配置文件，无法添加守护进程！
-		echo 请进入定时任务菜单手动指定系统定时任务文件路径！！！
-	fi
+stop_iptables(){
+    #重置iptables规则
+	ip rule del fwmark 1 table 100  2> /dev/null
+	ip route del local default dev lo table 100 2> /dev/null
+	iptables -t nat -D PREROUTING -p tcp -j clash 2> /dev/null
+	iptables -t nat -D PREROUTING -p udp -j clash_dns 2> /dev/null
+	iptables -t nat -D PREROUTING -p tcp -d 8.8.8.8 -j clash_dns 2> /dev/null
+	iptables -t nat -D PREROUTING -p tcp -d 8.8.4.4 -j clash_dns 2> /dev/null
+	iptables -t nat -F clash 2> /dev/null
+	iptables -t nat -X clash 2> /dev/null
+	iptables -t nat -F clash_dns 2> /dev/null
+	iptables -t nat -X clash_dns 2> /dev/null
+	iptables -D FORWARD -o utun -j ACCEPT 2> /dev/null
+	#重置udp规则
+	iptables -t mangle -D PREROUTING -p udp -j clash 2> /dev/null
+	iptables -t mangle -F clash 2> /dev/null
+	iptables -t mangle -X clash 2> /dev/null
+	#重置ipv6规则
+	ip6tables -t nat -D PREROUTING -p tcp -j clashv6 2> /dev/null
+	ip6tables -t nat -D PREROUTING -p udp -j clashv6_dns 2> /dev/null
+	ip6tables -t nat -F clashv6 2> /dev/null
+	ip6tables -t nat -X clashv6 2> /dev/null
+	ip6tables -t nat -F clashv6_dns 2> /dev/null
+	ip6tables -t nat -X clashv6_dns 2> /dev/null
+	ip6tables -D FORWARD -o utun -j ACCEPT 2> /dev/null
 }
+#面板配置保存相关
 web_save(){
-	#使用curl获取面板节点设置
-	curl -s -H "Authorization: Bearer ${secret}" -H "Content-Type:application/json" http://localhost:${db_port}/proxies | awk -F "{" '{for(i=1;i<=NF;i++) print $i}' | grep -E '^"all".*"Selector"' | grep -oE '"name".*"now".*",' | sed 's/"name"://g' | sed 's/"now"://g'| sed 's/"//g' > /tmp/clash_web_save
-	#对比文件，如果有变动则写入磁盘，否则清除缓存
-	if [ "$(cat /tmp/clash_web_save)" = "$(cat $clashdir/web_save 2>/dev/null)" ];then
-		rm -rf /tmp/clash_web_save
-	else
-		mv -f /tmp/clash_web_save $clashdir/web_save
+	get_save(){
+		if curl --version > /dev/null 2>&1;then
+			curl -s -H "Authorization: Bearer ${secret}" -H "Content-Type:application/json" "$1"
+		elif [ -n "$(wget --help 2>&1|grep '\-\-method')" ];then
+			wget -q --header="Authorization: Bearer ${secret}" --header="Content-Type:application/json" -O - "$1"
+		else
+			logger 当前系统未安装curl且wget的版本太低，无法保存节点配置！ 31
+			getconfig
+			cronset '保存节点配置'
+		fi
+	}
+	#使用get_save获取面板节点设置
+	get_save http://localhost:${db_port}/proxies | awk -F "{" '{for(i=1;i<=NF;i++) print $i}' | grep -E '^"all".*"Selector"' > /tmp/clash_web_check_$USER
+	while read line ;do
+		def=$(echo $line | awk -F "[\[,]" '{print $2}')
+		now=$(echo $line | grep -oE '"now".*",' | sed 's/"now"://g'| sed 's/,//g')
+		[ "$def" != "$now" ] && echo $line | grep -oE '"name".*"now".*",' | sed 's/"name"://g' | sed 's/"now"://g'| sed 's/"//g' >> /tmp/clash_web_save_$USER
+	done < /tmp/clash_web_check_$USER
+	rm -rf /tmp/clash_web_check_$USER
+	#对比文件，如果有变动且不为空则写入磁盘，否则清除缓存
+	if [ -s /tmp/clash_web_save_$USER ];then
+		compare /tmp/clash_web_save_$USER $clashdir/web_save
+		[ "$?" = 0 ] && rm -rf /tmp/clash_web_save_$USER || mv -f /tmp/clash_web_save_$USER $clashdir/web_save
 	fi
 }
 web_restore(){
+	put_save(){
+		if curl --version > /dev/null 2>&1;then
+			curl -sS -X PUT -H "Authorization: Bearer ${secret}" -H "Content-Type:application/json" "$1" -d "$2" >/dev/null
+		else
+			wget -q --method=PUT --header="Authorization: Bearer ${secret}" --header="Content-Type:application/json" --body-data="$2" "$1" >/dev/null
+		fi
+	}
 	#设置循环检测clash面板端口
 	i=1
-	while [ $i -lt 10 ]
-	do
+	while [ $i -lt 10 ];do
 		sleep 1
-		[ -n "$(curl -s http://localhost:${db_port})" ] && i=10
+		if curl --version > /dev/null 2>&1;then
+			test=$(curl -s http://localhost:${db_port})
+		else
+			test=$(wget -q -O - http://localhost:${db_port})
+		fi
+		[ -n "$test" ] && i=10
 	done
 	#发送数据
 	num=$(cat $clashdir/web_save | wc -l)
@@ -310,79 +478,161 @@ web_restore(){
 	do
 		group_name=$(awk -F ',' 'NR=="'${i}'" {print $1}' $clashdir/web_save | sed 's/ /%20/g')
 		now_name=$(awk -F ',' 'NR=="'${i}'" {print $2}' $clashdir/web_save)
-		curl -sS -X PUT -H "Authorization: Bearer ${secret}" -H "Content-Type:application/json" http://localhost:${db_port}/proxies/"${group_name}" -d "{\"name\":\"${now_name}\"}" >/dev/null
+		put_save http://localhost:${db_port}/proxies/${group_name} "{\"name\":\"${now_name}\"}"
 	done
-	exit 0
 }
-web_save_auto(){
-	if [ -n "$cronpath" ];then
-		if [ -z "$(cat $cronpath | grep '保存节点配置')" ];then
-			echo '*/10 * * * * test -n "$(pidof clash)"  &&  /etc/init.d/clash web_save #每10分钟保存节点配置' >> $cronpath
-			chmod 600 $cronpath
-		fi
+#启动相关
+catpac(){
+	host=$(ubus call network.interface.lan status 2>&1 | grep \"address\" | grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}';)
+	[ -z "$host" ] && host=$(ip a 2>&1 | grep -w 'inet' | grep 'global' | grep -E '192.|10.' | sed 's/.*inet.//g' | sed 's/\/[0-9][0-9].*$//g' | head -n 1)
+	[ -z "$host" ] && host=127.0.0.1
+	cat > /tmp/clash_pac <<EOF
+function FindProxyForURL(url, host) {
+	if (
+		isInNet(host, "0.0.0.0", "255.0.0.0")||
+		isInNet(host, "10.0.0.0", "255.0.0.0")||
+		isInNet(host, "127.0.0.0", "255.0.0.0")||
+		isInNet(host, "224.0.0.0", "224.0.0.0")||
+		isInNet(host, "240.0.0.0", "240.0.0.0")||
+		isInNet(host, "172.16.0.0",  "255.240.0.0")||
+		isInNet(host, "192.168.0.0", "255.255.0.0")||
+		isInNet(host, "169.254.0.0", "255.255.0.0")
+	)
+		return "DIRECT";
 	else
-		echo 找不到定时任务配置文件，无法添加守护进程！
-		echo 请进入定时任务菜单手动指定系统定时任务文件路径！！！
+		return "PROXY 192.168.31.1:7890; DIRECT; SOCKS5 192.168.31.1:7890"
+}
+EOF
+	compare /tmp/clash_pac $bindir/ui/pac
+	[ "$?" = 0 ] && rm -rf /tmp/clash_pac || mv -f /tmp/clash_pac $bindir/ui/pac
+}
+bfstart(){
+	#读取配置文件
+	getconfig
+	[ ! -d $bindir/ui ] && mkdir -p $bindir/ui
+	[ -z "$update_url" ] && update_url=https://cdn.jsdelivr.net/gh/juewuy/ShellClash@master
+	#检查clash核心
+	if [ ! -f $bindir/clash ];then
+		if [ -f $clashdir/clash ];then
+			mv $clashdir/clash $bindir/clash && chmod +x $bindir/clash
+		else
+			logger "未找到clash核心，正在下载！" 33
+			if [ -z "$clashcore" ];then
+				[ "$redir_mod" = "混合模式" -o "$redir_mod" = "Tun模式" ] && clashcore=clashpre || clashcore=clash
+			fi
+			[ -z "$cpucore" ] && source $clashdir/getdate.sh && getcpucore
+			[ -z "$cpucore" ] && logger 找不到设备的CPU信息，请手动指定处理器架构类型！ 31 && setcpucore
+			webget $bindir/clash "$update_url/bin/$clashcore/clash-linux-$cpucore"
+			[ "$?" = 1 ] && logger "核心下载失败，已退出！" 31 && rm -f $bindir/clash && exit 1
+			[ ! -x $bindir/clash ] && chmod +x $bindir/clash 	#检测可执行权限
+			clashv=$($bindir/clash -v | awk '{print $2}')
+			setconfig clashv $clashv
+		fi
+	fi
+	#检查数据库文件
+	if [ ! -f $bindir/Country.mmdb ];then
+		if [ -f $clashdir/Country.mmdb ];then
+			mv $clashdir/Country.mmdb $bindir/Country.mmdb
+		else
+			logger "未找到GeoIP数据库，正在下载！" 33
+			[ -z "$geotype" ] && geotype=cn_mini.mmdb
+			webget $bindir/Country.mmdb $update_url/bin/$geotype
+			[ "$?" = 1 ] && logger "数据库下载失败，已退出！" 31 && rm -f $bindir/Country.mmdb && exit 1
+			Geo_v=$(date +"%Y%m%d")
+			setconfig Geo_v $Geo_v
+		fi
+	fi
+	#检查dashboard文件
+	if [ -f $clashdir/ui/index.html -a ! -f $bindir/ui/index.html ];then
+		cp -rf $clashdir/ui $bindir
+	fi
+	catpac #生成pac文件
+	#检查yaml配置文件
+	if [ ! -f $clashdir/config.yaml ];then
+		if [ -n "$Url" -o -n "$Https" ];then
+			logger "未找到配置文件，正在下载！" 33
+			getyaml
+			exit 0
+		else
+			logger "未找到配置文件链接，请先导入配置文件！" 31
+			exit 1
+		fi
 	fi
 }
 afstart(){
+
 	#读取配置文件
 	getconfig
-	#修改iptables规则使流量进入clash
-	stop_iptables
-	[ "$redir_mod" != "纯净模式" ] && start_dns
-	[ "$redir_mod" != "纯净模式" ] && [ "$redir_mod" != "Tun模式" ] && start_redir
-	#标记启动时间
-	mark_time
-	#设置本机代理
-	[ "$local_proxy" = "已开启" ] && $0 set_proxy $mix_port
-	#启用面板配置自动保存
-	web_save_auto
-	#后台还原面板配置
-	[ -f $clashdir/web_save ] && web_restore &
+	$bindir/clash -t -d $bindir >/dev/null
+	if [ "$?" = 0 ];then
+		#设置iptables转发规则
+		[ "$redir_mod" != "纯净模式" ] && [ "$dns_no" != "已禁用" ] && start_dns
+		[ "$redir_mod" != "纯净模式" ] && [ "$redir_mod" != "Tun模式" ] && start_redir
+		[ "$redir_mod" = "Redir模式" ] && [ "$tproxy_mod" = "已开启" ] && start_udp
+		#标记启动时间
+		mark_time
+		#设置本机代理
+		[ "$local_proxy" = "已开启" ] && $0 set_proxy $mix_port $db_port
+		#启用面板配置自动保存
+		cronset '#每10分钟保存节点配置' "*/10 * * * * test -n \"$(pidof clash)\" && $clashdir/start.sh web_save #每10分钟保存节点配置"
+		[ -f $clashdir/web_save ] && web_restore & #后台还原面板配置
+	else
+		logger "clash服务启动失败！请查看报错信息！" 31
+		$bindir/clash -t -d $bindir
+		echo "$($bindir/clash -t -d $bindir)" >> $clashdir/log
+		$0 stop
+		exit 1
+	fi
+}
+start_old(){
+	#使用传统后台执行二进制文件的方式执行
+	$bindir/clash -d $bindir >/dev/null &
+	afstart
+	$0 daemon
 }
 
 case "$1" in
 
+bfstart)
+		bfstart
+	;;
 afstart)
 		afstart
 	;;
 start)		
-		#读取配置文件
+		[ -n "$(pidof clash)" ] && $0 stop #禁止多实例
 		getconfig
+		#检测必须文件并下载
+		bfstart
+		stop_iptables #清理iptables
 		#使用内置规则强行覆盖config配置文件
 		[ "$modify_yaml" != "已开启" ] && modify_yaml
 		#使用不同方式启动clash服务
 		if [ "$start_old" = "已开启" ];then
-			$clashdir/clash -d $clashdir >/dev/null 2>&1 &
-			sleep 1
-			daemon
-			afstart
+			start_old
 		elif [ -f /etc/rc.common ];then
 			/etc/init.d/clash start
-		else
+		elif [ "$USER" = "root" ];then
 			systemctl start clash.service
+		else
+			start_old
 		fi
 	;;
 stop)	
-		#读取配置文件
 		getconfig
-		#保存面板配置
-		web_save
+		[ -n "$(pidof clash)" ] && web_save #保存面板配置
 		#删除守护进程&面板配置自动保存
-		sed -i /clash保守模式守护进程/d $cronpath >/dev/null 2>&1
-		sed -i /面板配置自动保存/d $cronpath >/dev/null 2>&1
+		cronset "clash保守模式守护进程"
+		cronset "保存节点配置"
 		#多种方式结束进程
 		if [ -f /etc/rc.common ];then
 			/etc/init.d/clash stop >/dev/null 2>&1
-		else
+		elif [ "$USER" = "root" ];then
 			systemctl stop clash.service >/dev/null 2>&1
 		fi
-		killall -9 clash >/dev/null 2>&1
-		#清理iptables
-		stop_iptables
-		#禁用本机代理
-		[ "$local_proxy" = "已开启" ] && $0 unset_proxy
+		PID=$(pidof clash) && [ -n "$PID" ] &&  kill -9 $PID >/dev/null 2>&1
+		stop_iptables #清理iptables
+		[ "$local_proxy" = "已开启" ] && $0 unset_proxy #禁用本机代理
         ;;
 restart)
         $0 stop
@@ -392,20 +642,56 @@ getyaml)
 		getconfig
 		getyaml
 		;;
-daemon)	
-		daemon
+updateyaml)	
+		$0 getyaml
+		$0 restart
+		;;
+webget)
+		webget $2 $3 $4 $5
 		;;
 web_save)
 		getconfig
 		web_save
 	;;
+daemon)
+		getconfig
+		cronset '#clash保守模式守护进程' "*/1 * * * * test -z \"$(pidof clash)\" && $clashdir/start.sh restart #clash保守模式守护进程"
+	;;
+cronset)
+		cronset $2 $3
+	;;
 set_proxy)
-		echo 'export all_proxy=http://127.0.0.1:'"$2" >> /etc/profile
-		echo 'export ALL_PROXY=$all_proxy' >> /etc/profile
+		getconfig
+		#GNOME配置
+		if  [ "$local_proxy_type" = "GNOME" ];then
+			gsettings set org.gnome.system.proxy autoconfig-url "http://127.0.0.1:$db_port/ui/pac"
+			gsettings set org.gnome.system.proxy mode "auto"
+		#KDE配置
+		elif  [ "$local_proxy_type" = "KDE" ];then
+			kwriteconfig5 --file kioslaverc --group "Proxy Settings" --key "Proxy Config Script" "http://127.0.0.1:$db_port/ui/pac"
+			kwriteconfig5 --file kioslaverc --group "Proxy Settings" --key "ProxyType" 2
+		#环境变量方式
+		else
+			[ -w ~/.bashrc ] && profile=~/.bashrc
+			[ -w /etc/profile ] && profile=/etc/profile
+			echo 'export all_proxy=http://127.0.0.1:'"$mix_port" >> $profile
+			echo 'export ALL_PROXY=$all_proxy' >>  $profile
+		fi
 	;;
 unset_proxy)
-		sed -i '/all_proxy/'d /etc/profile
-		sed -i '/ALL_PROXY/'d /etc/profile
+		#GNOME配置
+		if  gsettings --version >/dev/null 2>&1 ;then
+			gsettings set org.gnome.system.proxy mode "none"
+		fi
+		#KDE配置
+		if  kwriteconfig5 -h >/dev/null 2>&1 ;then
+			kwriteconfig5 --file kioslaverc --group "Proxy Settings" --key "ProxyType" 0
+		fi
+		#环境变量方式
+		[ -w ~/.bashrc ] && profile=~/.bashrc
+		[ -w /etc/profile ] && profile=/etc/profile
+		sed -i '/all_proxy/'d  $profile
+		sed -i '/ALL_PROXY/'d  $profile
 	;;
 esac