From 35e998e6975eefaaf321dc5cddcd09c17018a81c Mon Sep 17 00:00:00 2001 From: juewuy Date: Fri, 25 Jun 2021 00:23:32 +0800 Subject: [PATCH] =?UTF-8?q?v1.4.1-test=20~=E9=80=82=E9=85=8D=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=B2=A1=E6=9C=89crontab=E7=9A=84=E6=A2=85=E6=9E=97?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=20~=E4=B8=8D=E5=86=8D=E4=BD=BF=E7=94=A8cat?= =?UTF-8?q?=E5=AF=B9=E6=AF=94yaml=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/clashfm.tar.gz | Bin 30636 -> 30632 bytes bin/version | 2 +- scripts/start.sh | 30 +++++++++++++++--------------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index 61fb696a34f2d4d493bfd7d906c6fce612257f38..87e431374022f911a5d032622d74d399eac96684 100644 GIT binary patch delta 16336 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 S|NH+N_4gCg0;r4t0s;V^>BpG> delta 16340 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 Hk zf4#mg-RfDQOxGVg78)hCa1f5lU4|JW5GG$R6o{;$ozj5?@j1?}TR4YDmLa35 z__hQ;7g9sp-Gv&dJE>9>V;|;H-OwC`qf@@88eFk_{1lP|aTE<044(a1fVqgHXqzph z<$XY(n*OxgsqD}C2LS!7ObpoiO0|A&e|)Icpqe@7Koptc#L)l^%=j=&B|BV8?6Zvh zu+OAhw;*-RQnYLC9h+FDxbIxAsM?js9pR^)w@2$22g_+bIX4#UV!V-_V;Ni*pqUZ} zT#98W%X(BFNhAp@9vCy7l624aF}30N5y^|;o+S2KOARRUsI_LX*iM-(3k>jhbRmXL969Ii1U$3EfiNmR~QH z%At1osH-UR9jKx414Vs~J-ah?zaH}N4#a-4ez{q@|27IQn6ZYi{{;D-I4ASYaOj& z5W=Eq?By6UXnrdtM==kKwM>#5B+`e_E!6VkT_@g|m5Nwf#MCiyj)-ZYJ|I33u?*Nt=nQhydnn+tiqq~H zGtOKpTE7?Xqr`I|LSe?OIot>WlQn*3*hWEcx&7A9v>HFyBUni^f45?(J@q{{x)s8@ zS=_8xk0YZdTtmd=)f|Cxe>G1-y~6HXeUWhyxGAGZmt_g;oBM3-nd7u#4p2j5jIER( z#xul6qZezUplgsNRt|V(x`xRot69?~0s-(lzR)aVId5*Hj~zb&j1JPcpp#ivbdZS_ z7zMcI|ruw5d^fJIRvJno0l$!BZDCgNuG>T9w`UmL}d&t-DQbFv%8&_pf($~gcEe1>H5LLzd z5)UI^vqSCTe-P^$N0CRWJzYF&!x@nGK4<-CY=V==yPXy5-x}4?rTA&*hJha-b)nv( zxI!(F+4
iPvs8>4jBCLQ6X_GD#7;UdR?@wx(rsH|r5iD} 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 W|Nj5}|Nj3*|NR6&M9YQ%0s;UFrt7T$ diff --git a/bin/version b/bin/version index d5027d4..0c5e688 100644 --- a/bin/version +++ b/bin/version @@ -1,4 +1,4 @@ clash_v=1.6.0 clashpre_v=2021.05.08 GeoIP_v=20210623 -versionsh=1.4.1-test +versionsh=1.4.1-test diff --git a/scripts/start.sh b/scripts/start.sh index 34c3ac1..503e32b 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -53,20 +53,20 @@ logger(){ 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 } +croncmd(){ + if [ -n "$(crontab -h 2>&1 | grep '\-l')" ];then + crontab $1 + else + crondir="$(crond -h 2>&1 | grep -oE 'Default:.*' | awk -F ":" '{print $2}')" + [ ! -w "$crondir" ] && crondir="/etc/storage/cron/crontabs" + [ ! -w "$crondir" ] && crondir="/var/spool/cron/crontabs" + [ ! -w "$crondir" ] && crondir="/var/spool/cron" + [ ! -w "$crondir" ] && echo "你的设备不支持定时任务配置,脚本大量功能无法启用,请前往 https://t.me/clashfm 申请适配!" + [ "$1" = "-l" ] && cat $crondir/$USER 2>/dev/null + [ -f "$1" ] && cat $1 > $crondir/$USER + fi +} cronset(){ - croncmd(){ - if [ -n "$(crontab -h 2>&1 | grep '\-l')" ];then - crontab $1 - else - crondir="$(crond -h 2>&1 | grep -oE 'Default:.*' | awk -F ":" '{print $2}')" - [ ! -w "$crondir" ] && crondir="/etc/storage/cron/crontabs" - [ ! -w "$crondir" ] && crondir="/var/spool/cron/crontabs" - [ ! -w "$crondir" ] && crondir="/var/spool/cron" - [ ! -w "$crondir" ] && echo "你的设备不支持定时任务配置,脚本大量功能无法启用,请前往 https://t.me/clashfm 申请适配!" - [ "$1" = "-l" ] && cat $crondir/$USER 2>/dev/null - [ -f "$1" ] && cat $1 > $crondir/$USER - fi - } # 参数1代表要移除的关键字,参数2代表要添加的任务语句 tmpcron=/tmp/cron_$USER croncmd -l > $tmpcron @@ -283,7 +283,7 @@ EOF fi #如果没有使用小闪存模式 if [ "$tmpdir" != "$bindir" ];then - compare $tmpdir/config.yaml $yaml + cmp -s $tmpdir/config.yaml $yaml >/dev/null 2>&1 [ "$?" != 0 ] && mv -f $tmpdir/config.yaml $yaml || rm -f $tmpdir/config.yaml fi rm -f $tmpdir/set.yaml @@ -685,7 +685,7 @@ afstart(){ #设置本机代理 [ "$local_proxy" = "已开启" ] && $0 set_proxy $mix_port $db_port #加载定时任务 - [ -f $clashdir/cron ] && crontab $clashdir/cron + [ -f $clashdir/cron ] && croncmd $clashdir/cron #启用面板配置自动保存 if [ "$restore" = false ];then cronset '#每10分钟保存节点配置' "*/10 * * * * test -n \"\$(pidof clash)\" && $clashdir/start.sh web_save #每10分钟保存节点配置"