From 2026fe5adcc007f05826c296cf5ac25e59e2f7e0 Mon Sep 17 00:00:00 2001 From: juewuy Date: Thu, 13 Aug 2020 22:38:51 +0800 Subject: [PATCH] =?UTF-8?q?v0.9.0=20~=E6=96=B0=E5=A2=9E=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8A=9F=E8=83=BD=EF=BC=88=E5=AE=9E=E9=AA=8C?= =?UTF-8?q?=E6=80=A7=EF=BC=8C=E6=AC=A2=E8=BF=8E=E6=B5=8B=E8=AF=95=EF=BC=89?= =?UTF-8?q?=20~=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E6=97=B6=E4=B8=80=E4=B8=AA=E6=8A=A5=E9=94=99=E7=9A=84=E5=B0=8F?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/clashfm.tar.gz | Bin 10559 -> 11405 bytes bin/version | 2 +- scripts/clash.sh | 105 ++++++++++++++++++++++++++++++++------------- scripts/getdate.sh | 8 ++-- 4 files changed, 81 insertions(+), 34 deletions(-) diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index 28e759892588a9d1f5188b8522dbefccbaf5ffe7..96d5a744b4892d474e81d456be50cf9c425b39e1 100644 GIT binary patch literal 11405 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 literal 10559 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 N&)<4$VdwzD006Q+P!#|G diff --git a/bin/version b/bin/version index 6e57b6e..ecdacae 100644 --- a/bin/version +++ b/bin/version @@ -1 +1 @@ -versionsh=0.8.7 +versionsh=0.9.0 diff --git a/scripts/clash.sh b/scripts/clash.sh index 6b75c1a..7dd8e48 100644 --- a/scripts/clash.sh +++ b/scripts/clash.sh @@ -3,7 +3,7 @@ getconfig(){ #版本号 -versionsh_l=0.8.7 +versionsh_l=0.9.0 #服务器地址 if [ -z $update_url ]; then update_url=https://cdn.jsdelivr.net/gh/juewuy/clash-for-Miwifi/ @@ -120,7 +120,6 @@ echo -e " 3 选取\033[33m代理规则\033[0m模版" echo -e " 4 选择配置生成服务器" echo -e " 5 \033[36m还原\033[0m配置文件" echo -e " 6 \033[32m手动更新\033[0m订阅" -echo -e " 7 设置自动更新(未完成)" echo -e " 0 返回上级菜单" read -p "请输入对应数字 > " num if [ -z $num ];then @@ -529,31 +528,44 @@ clashcron(){ setcron(){ echo ----------------------------------------------- - echo -e " 输入 1-7 对应\033[36m每周相应天\033[0m运行" - echo -e " 输入 8 设为\033[36m每天定时\033[0m运行" - echo -e " 输入 1,3,6 代表\033[36m每周1,3,6\033[0m运行(注意小写逗号分隔)" + echo -e " 正在设置:\033[32m$cronname\033[0m定时任务" + echo -e " 输入 1-7 对应\033[33m每周相应天\033[0m运行" + echo -e " 输入 8 设为\033[33m每天定时\033[0m运行" + echo -e " 输入 1,3,6 代表\033[36m每周1,3,6\033[0m运行(注意用小写逗号分隔)" + echo -e " 输入 9 \033[31m删除定时任务\033[0m" echo -e " 输入 0 返回上级菜单" read -p "请输入对应数字 > " num if [ -z $num ]; then echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m请输入正确的数字!\033[0m" - setcron + clashcron elif [[ $num == 0 ]]; then clashcron + elif [[ $num == 9 ]]; then + sed -i /$cronname/d $cronpath + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + echo -e "\033[31m定时任务:$cronname已删除!\033[0m" + clashcron elif [[ $num == 8 ]]; then week='*' + week1=每天 echo 已设为每天定时运行! else week=$num + week1=每周$week echo 已设为每周 $num 运行! fi #设置具体时间 echo ----------------------------------------------- - read -p "请输入小时(0-24) > " num + read -p "请输入小时(0-23) > " num if [ -z $num ]; then echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m请输入正确的数字!\033[0m" setcron + elif [ $num -gt 23 ] || [ $num -lt 0 ]; then + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + echo -e "\033[31m请输入正确的数字!\033[0m" + setcron else hour=$num fi @@ -563,22 +575,51 @@ clashcron(){ echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[31m请输入正确的数字!\033[0m" setcron + elif [ $num -gt 60 ] || [ $num -lt 0 ]; then + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + echo -e "\033[31m请输入正确的数字!\033[0m" + setcron else min=$num fi echo ----------------------------------------------- - echo 设定为:每周$week的$hour点$min,$cronname - read -p "是否确认添加?(1/0) > " res - + echo 将在$week1的$hour点$min分$cronname(旧的任务会被覆盖) + read -p "是否确认添加定时任务?(1/0) > " res + if [ "$res" = '1' ]; then + sed -i /$cronname/d $cronpath + echo "$min $hour * * $week $cronset >/dev/null 2>&1 #$week1的$hour点$min分$cronname" >> $cronpath + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + echo -e "\033[31m定时任务已添加!!!\033[0m" + fi + clashcron } + checkcron(){ + if [ -d /etc/crontabs/ ]; then + cronpath="/etc/crontabs/root" + elif [ -d /var/spool/cron/ ]; then + cronpath="/var/spool/cron/root" + elif [ -d /var/spool/cron/crontabs/ ]; then + cronpath="/var/spool/cron/crontabs/root" + else + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + echo "找不到定时任务文件,无法添加定时任务!" + clashsh + fi + + } +#定时任务菜单 +checkcron #检测定时任务文件 echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[30;47m欢迎使用定时任务功能:\033[0m" echo -e "\033[44m 实验性功能,遇问题请加TG群反馈:\033[42;30m t.me/clashfm \033[0m" echo ----------------------------------------------- -echo -e " 1 设置\033[36m定时重启\033[0mclash服务" -echo -e " 2 设置\033[36m定时关闭\033[0mclash服务" -echo -e " 3 设置\033[36m定时开启\033[0mclash服务" -echo -e " 4 设置\033[36m定时更新\033[0m订阅链接" +echo -e "\033[33m当前已经添加的定时任务有:\033[36m" +crontab -l | egrep -o '#.*' +echo -e "\033[0m"----------------------------------------------- +echo -e " 1 设置\033[33m定时重启\033[0mclash服务" +echo -e " 2 设置\033[31m定时停止\033[0mclash服务" +echo -e " 3 设置\033[32m定时开启\033[0mclash服务" +echo -e " 4 设置\033[33m定时更新\033[0m订阅链接(实验性,可能不稳定)" echo -e " 0 返回上级菜单" read -p "请输入对应数字 > " num if [ -z $num ]; then @@ -592,13 +633,24 @@ elif [[ $num == 0 ]]; then elif [[ $num == 1 ]]; then cronname=重启clash服务 cronset='/etc/init.d/clash restart' + setcron +elif [[ $num == 2 ]]; then + cronname=停止clash服务 + cronset='/etc/init.d/clash stop' + setcron +elif [[ $num == 3 ]]; then + cronname=开启clash服务 + cronset='/etc/init.d/clash start' + setcron +elif [[ $num == 4 ]]; then + cronname=更新订阅链接 + cronset="source /etc/profile && source $clashdir/getdate.sh && getyaml" + setcron - - - - - - +else + echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + echo -e "\033[31m请输入正确的数字!\033[0m" + clashsh fi } @@ -610,7 +662,7 @@ echo -e " 1 \033[32m启动/重启\033[0mclash服务" echo -e " 2 clash\033[33m高级设置\033[0m" echo -e " 3 \033[31m停止\033[0mclash服务" echo -e " 4 $auto1" -echo -e " 5 设置定时任务(施工中)" +echo -e " 5 设置定时任务" echo -e " 6 导入\033[32m节点/订阅\033[0m链接" echo -e " 8 \033[35m测试菜单\033[0m" echo -e " 9 \033[36m更新/卸载\033[0m" @@ -656,14 +708,7 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then clashsh elif [[ $num == 5 ]]; then - echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - echo -e "\033[31m正在施工中,敬请期待!\033[0m" - echo -e "\033[32m正在施工中,敬请期待!\033[0m" - echo -e "\033[33m正在施工中,敬请期待!\033[0m" - echo -e "\033[34m正在施工中,敬请期待!\033[0m" - echo -e "\033[35m正在施工中,敬请期待!\033[0m" - echo -e "\033[36m正在施工中,敬请期待!\033[0m" - clashsh + clashcron elif [[ $num == 6 ]]; then clashlink @@ -688,7 +733,7 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then elif [[ $num == 0 ]]; then clashsh elif [[ $num == 1 ]]; then - etc/init.d/clash stop + /etc/init.d/clash stop echo -e "\033[31m如有报错请截图后到TG群询问!!!\033[0m" $clashdir/clash -d $clashdir & { sleep 3 ; kill $! & } echo -e "\033[31m如有报错请截图后到TG群询问!!!\033[0m" diff --git a/scripts/getdate.sh b/scripts/getdate.sh index d061cd8..8231f98 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -2,6 +2,7 @@ # Copyright (C) Juewuy getyaml(){ +ccfg=$clashdir/mark source $ccfg #前后端订阅服务器地址索引,可在此处添加! Server=`sed -n ""$server_link"p"< /dev/null 2>&1 result=$(curl -w %{http_code} -kLo $yamlnew $Https) @@ -58,7 +60,7 @@ if [ "$result" != "200" ];then sed -i "1i\server_link=$server_link" $ccfg getyaml fi - exit; + #exit; fi else if cat $yamlnew | grep ', server:' >/dev/null;then @@ -103,9 +105,9 @@ else echo -e "\033[33m请检查如上配置文件信息:\033[0m" echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ fi - exit; + #exit; fi -exit +#exit } getlink(){ #设置输入循环