v1.0.0beta9
~修复部分设备启动时报错的bug ~修改更新脚本，优化更新流程 ~安装systemd启动脚本时增加reload ~进一步优化安装脚本
This commit is contained in:
juewuy
@@ -694,25 +694,25 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then
|
||||
elif [[ $num == 8 ]]; then
|
||||
echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
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[32msubconverter \033[0m作者\033[36m tindy2013\033[0m 项目地址：\033[32mhttps://github.com/tindy2013/subconverter\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"
|
||||
update
|
||||
update
|
||||
|
||||
elif [[ $num == 9 ]]; then
|
||||
read -p "确认卸载clash？（警告：该操作不可逆！）[1/0] " res
|
||||
if [ "$res" = '1' ]; then
|
||||
/etc/init.d/clash disable
|
||||
/etc/init.d/clash stop
|
||||
$clashdir/start.sh stop
|
||||
rm -rf $clashdir
|
||||
rm -rf /etc/init.d/clash
|
||||
rm -rf /etc/systemd/system/clash.service
|
||||
rm -rf /usr/lib/systemd/system/clash.service
|
||||
rm -rf /www/clash
|
||||
rm -rf $csh
|
||||
sed -i '/alias clash=*/'d /etc/profile
|
||||
sed -i '/export clashdir=*/'d /etc/profile
|
||||
source /etc/profile > /dev/null 2>&1
|
||||
echo 已卸载clash相关文件！
|
||||
echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
echo 已卸载clash相关文件！有缘再会！
|
||||
exit
|
||||
fi
|
||||
echo -e "\033[31m操作已取消！\033[0m"
|
||||
|
||||
@@ -223,39 +223,33 @@ else
|
||||
echo -e "\033[31m请输入正确的链接地址！！！\033[0m"
|
||||
fi
|
||||
}
|
||||
getsh(){
|
||||
echo -----------------------------------------------
|
||||
echo -e "当前脚本版本为：\033[33m $versionsh_l \033[0m"
|
||||
echo -e "最新脚本版本为：\033[32m $release_new \033[0m"
|
||||
echo -----------------------------------------------
|
||||
read -p "是否更新脚本？[1/0] > " res
|
||||
if [ "$res" = '1' ]; then
|
||||
if command -v curl &> /dev/null; then
|
||||
echo 正在获取更新文件
|
||||
result=$(curl -w %{http_code} -kLo /tmp/clashfm.tar.gz $update_url/bin/clashfm.tar.gz)
|
||||
else $result
|
||||
wget-ssl -q --no-check-certificate --tries=1 --timeout=10 -O /tmp/clashfm.tar.gz $update_url/bin/clashfm.tar.gz
|
||||
[ $? -eq 0 ] && result="200"
|
||||
fi
|
||||
gettar(){
|
||||
result=$(curl -w %{http_code} -kLo /tmp/clashfm.tar.gz $tarurl)
|
||||
[ "$result" != "200" ] && echo "文件下载失败！" && exit 1
|
||||
#解压
|
||||
echo -----------------------------------------------
|
||||
echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
echo 开始解压文件！
|
||||
mkdir -p $clashdir > /dev/null
|
||||
tar -zxvf '/tmp/clashfm.tar.gz' -C $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
|
||||
mv $clashdir/clashservice /etc/init.d/clash #将rc服务文件移动到系统目录
|
||||
chmod 777 /etc/init.d/clash #授予权限
|
||||
#设为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
|
||||
mv $clashdir/clash.service $sysdir/clash.service #将service服务文件移动到系统目录
|
||||
sed -i "s%/etc/clash%${dir}/clash%g" $sysdir/clash.service
|
||||
#设为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
|
||||
@@ -264,18 +258,35 @@ if [ "$res" = '1' ]; then
|
||||
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 $ccfg
|
||||
sed -i "1i\versionsh_l=$release_new" $ccfg
|
||||
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 /tmp/clashversion
|
||||
rm -rf $clashdir/clashservice
|
||||
rm -rf $clashdir/clash.service
|
||||
}
|
||||
getsh(){
|
||||
echo -----------------------------------------------
|
||||
echo -e "当前脚本版本为：\033[33m $versionsh_l \033[0m"
|
||||
echo -e "最新脚本版本为：\033[32m $release_new \033[0m"
|
||||
echo -----------------------------------------------
|
||||
read -p "是否更新脚本？[1/0] > " res
|
||||
if [ "$res" = '1' ]; then
|
||||
tarurl=$update_url/bin/clashfm.tar.gz
|
||||
#下载更新
|
||||
gettar
|
||||
#提示
|
||||
echo -----------------------------------------------
|
||||
echo -e "\033[32m管理脚本更新成功!\033[0m"
|
||||
echo -----------------------------------------------
|
||||
exit;
|
||||
else
|
||||
update
|
||||
else
|
||||
update
|
||||
fi
|
||||
}
|
||||
getcore(){
|
||||
|
||||
@@ -198,7 +198,7 @@ exper='experimental: {ignore-resolve-fail: true, interface-name: en0}'
|
||||
#预删除需要添加的项目
|
||||
i=$(grep -n "^proxies:" $clashdir/config.yaml | head -1 | cut -d ":" -f 1)
|
||||
i=$(($i-1))
|
||||
sed -i '1,'$i'd' $clashdir/config.yaml
|
||||
sed -i "1,${i}d" $clashdir/config.yaml
|
||||
#添加配置
|
||||
sed -i "1i$mix" $clashdir/config.yaml
|
||||
sed -i "1a$redir" $clashdir/config.yaml
|
||||
@@ -304,12 +304,7 @@ checkcron(){
|
||||
}
|
||||
daemon(){
|
||||
checkcron
|
||||
echo '*/1 * * * * test -z "$(pidof clash)" && /etc/init.d/clash start #clash守护进程' >> $cronpath
|
||||
chmod 600 $cronpath
|
||||
}
|
||||
daemon_old(){
|
||||
checkcron
|
||||
echo '*/1 * * * * test -z "$(pidof clash)" && '"$clashdir/clash -d $clashdir >/dev/null 2>&1 & #clash守护进程" >> $cronpath
|
||||
echo '*/1 * * * * test -z "$(pidof clash)" && /etc/init.d/clash restart #clash守护进程' >> $cronpath
|
||||
chmod 600 $cronpath
|
||||
}
|
||||
afstart(){
|
||||
@@ -336,7 +331,7 @@ start)
|
||||
#使用不同方式启动clash服务
|
||||
if [ "$start_old" = "已开启" ];then
|
||||
$clashdir/clash -d $clashdir >/dev/null 2>&1 &
|
||||
daemon_old
|
||||
daemon
|
||||
afstart
|
||||
elif [ -f /etc/rc.common ];then
|
||||
/etc/init.d/clash start
|
||||
@@ -347,7 +342,7 @@ start)
|
||||
stop)
|
||||
#删除守护
|
||||
checkcron
|
||||
sed -i /clash守护进程/d $cronpath
|
||||
sed -i /clash守护进程/d $cronpath >/dev/null 2>&1
|
||||
#多种方式结束进程
|
||||
if [ -f /etc/rc.common ];then
|
||||
/etc/init.d/clash stop >/dev/null 2>&1
|
||||
|
||||
Reference in New Issue
Block a user