mirror of
https://github.com/juewuy/ShellCrash.git
synced 2026-03-17 08:49:00 +00:00
Merge pull request #1134 from sofia-riese/patch-4
fix(5_task): add double quote to prevent word splitting
This commit is contained in:
juewuy
@@ -4,11 +4,12 @@
|
||||
[ -n "$__IS_MODULE_5_TASK_LOADED" ] && return
|
||||
__IS_MODULE_5_TASK_LOADED=1
|
||||
|
||||
#通用工具
|
||||
# 通用工具
|
||||
. "$CRASHDIR"/libs/set_config.sh
|
||||
. "$CRASHDIR"/libs/set_cron.sh
|
||||
#任务工具
|
||||
set_cron(){
|
||||
|
||||
# 任务工具
|
||||
set_cron() {
|
||||
[ -z "$week" ] && week=*
|
||||
[ -z "$hour" ] && hour=*
|
||||
[ -z "$min" ] && min=0
|
||||
@@ -23,29 +24,33 @@ set_cron(){
|
||||
unset week hour min
|
||||
sleep 1
|
||||
}
|
||||
set_service(){
|
||||
|
||||
set_service() {
|
||||
# 参数1代表要任务类型,参数2代表任务ID,参数3代表任务描述,参数4代表running任务cron时间
|
||||
task_file="$CRASHDIR"/task/$1
|
||||
[ -s "$task_file" ] && sed -i "/$3/d" "$task_file"
|
||||
#运行时每分钟执行的任务特殊处理
|
||||
if [ "$1" = "running" ];then
|
||||
# 运行时每分钟执行的任务特殊处理
|
||||
if [ "$1" = "running" ]; then
|
||||
task_txt="$4 $CRASHDIR/task/task.sh $2 $3"
|
||||
echo "$task_txt" >> "$task_file"
|
||||
echo "$task_txt" >>"$task_file"
|
||||
[ -n "$(pidof CrashCore)" ] && cronset "$3" "$task_txt"
|
||||
else
|
||||
echo "$CRASHDIR/task/task.sh $2 $3" >> "$task_file"
|
||||
echo "$CRASHDIR/task/task.sh $2 $3" >>"$task_file"
|
||||
fi
|
||||
echo -e "任务【$3】\033[32m添加成功！\033[0m"
|
||||
sleep 1
|
||||
}
|
||||
#任务界面
|
||||
task_user_add(){ #自定义命令添加
|
||||
|
||||
# 任务界面
|
||||
#
|
||||
# 自定义命令添加
|
||||
task_user_add() {
|
||||
echo "-----------------------------------------------"
|
||||
echo -e "\033[33m命令可包含空格，请确保命令可执行！\033[0m"
|
||||
echo -e "\033[36m此处不要添加执行条件，请在添加完成后返回添加具体执行条件！\033[0m"
|
||||
echo -e "也可以手动编辑\033[32m${CRASHDIR}/task/task.user\033[0m添加"
|
||||
read -p "请输入命令语句 > " script
|
||||
if [ -n "$script" ];then
|
||||
if [ -n "$script" ]; then
|
||||
task_command=$script
|
||||
echo -e "请检查输入：\033[32m$task_command\033[0m"
|
||||
#获取本任务ID
|
||||
@@ -54,7 +59,7 @@ task_user_add(){ #自定义命令添加
|
||||
task_id=$((task_max_id + 1))
|
||||
read -p "请输入任务备注 > " txt
|
||||
[ -n "$txt" ] && task_name=$txt || task_name=自定义任务$task_id
|
||||
echo "$task_id#$task_command#$task_name" >> "$CRASHDIR"/task/task.user
|
||||
echo "$task_id#$task_command#$task_name" >>"$CRASHDIR"/task/task.user
|
||||
echo -e "\033[32m自定义任务已添加！\033[0m"
|
||||
sleep 1
|
||||
else
|
||||
@@ -62,7 +67,9 @@ task_user_add(){ #自定义命令添加
|
||||
sleep 1
|
||||
fi
|
||||
}
|
||||
task_user_del(){ #自定义命令删除
|
||||
|
||||
# 自定义命令删除
|
||||
task_user_del() {
|
||||
echo "-----------------------------------------------"
|
||||
echo -e "请输入对应ID移除对应自定义任务(不会影响内置任务)"
|
||||
echo -e "也可以手动编辑\033[32m${CRASHDIR}/task/task.user\033[0m"
|
||||
@@ -72,7 +79,7 @@ task_user_del(){ #自定义命令删除
|
||||
echo "0 返回上级菜单"
|
||||
echo "-----------------------------------------------"
|
||||
read -p "请输入对应数字 > " num
|
||||
if [ -n "$num" ];then
|
||||
if [ -n "$num" ]; then
|
||||
sed -i "/^$num#/d" "$CRASHDIR"/task/task.user 2>/dev/null
|
||||
[ "$num" != 0 ] && task_user_del
|
||||
else
|
||||
@@ -80,20 +87,21 @@ task_user_del(){ #自定义命令删除
|
||||
sleep 1
|
||||
fi
|
||||
}
|
||||
task_add(){ #任务添加
|
||||
|
||||
# 任务添加
|
||||
task_add() {
|
||||
echo "-----------------------------------------------"
|
||||
echo -e "\033[36m请选择需要添加的任务\033[0m"
|
||||
echo "-----------------------------------------------"
|
||||
#输出任务列表
|
||||
# 输出任务列表
|
||||
cat "$CRASHDIR"/task/task.list "$CRASHDIR"/task/task.user 2>/dev/null | grep -Ev '^(#|$)' | awk -F '#' '{print " "NR" "$3}'
|
||||
echo "-----------------------------------------------"
|
||||
echo -e " 0 返回上级菜单"
|
||||
read -p "请输入对应数字 > " num
|
||||
case "$num" in
|
||||
0)
|
||||
;;
|
||||
[1-9]|[1-9][0-9])
|
||||
if [ "$num" -le "$(cat "$CRASHDIR"/task/task.list "$CRASHDIR"/task/task.user 2>/dev/null | wc -l)" ];then
|
||||
0) ;;
|
||||
[1-9] | [1-9][0-9])
|
||||
if [ "$num" -le "$(cat "$CRASHDIR"/task/task.list "$CRASHDIR"/task/task.user 2>/dev/null | wc -l)" ]; then
|
||||
task_id=$(cat "$CRASHDIR"/task/task.list "$CRASHDIR"/task/task.user 2>/dev/null | grep -Ev '^(#|$)' | sed -n "$num p" | awk -F '#' '{print $1}')
|
||||
task_name=$(cat "$CRASHDIR"/task/task.list "$CRASHDIR"/task/task.user 2>/dev/null | grep -Ev '^(#|$)' | sed -n "$num p" | awk -F '#' '{print $3}')
|
||||
task_type
|
||||
@@ -106,19 +114,23 @@ task_add(){ #任务添加
|
||||
;;
|
||||
esac
|
||||
}
|
||||
task_del(){ #任务删除
|
||||
#删除定时任务
|
||||
croncmd -l > "$TMPDIR"/cron
|
||||
|
||||
# 任务删除
|
||||
task_del() {
|
||||
# 删除定时任务
|
||||
croncmd -l >"$TMPDIR"/cron
|
||||
sed -i "/$1/d" "$TMPDIR"/cron && croncmd "$TMPDIR"/cron
|
||||
rm -f "$TMPDIR"/cron
|
||||
#删除条件任务
|
||||
# 删除条件任务
|
||||
sed -i "/$1/d" "$CRASHDIR"/task/cron 2>/dev/null
|
||||
sed -i "/$1/d" "$CRASHDIR"/task/bfstart 2>/dev/null
|
||||
sed -i "/$1/d" "$CRASHDIR"/task/afstart 2>/dev/null
|
||||
sed -i "/$1/d" "$CRASHDIR"/task/running 2>/dev/null
|
||||
sed -i "/$1/d" "$CRASHDIR"/task/affirewall 2>/dev/null
|
||||
}
|
||||
task_type(){ #任务条件选择菜单
|
||||
|
||||
# 任务条件选择菜单
|
||||
task_type() {
|
||||
echo "-----------------------------------------------"
|
||||
echo -e "请选择任务\033[36m【$task_name】\033[0m执行条件："
|
||||
echo "-----------------------------------------------"
|
||||
@@ -147,11 +159,11 @@ task_type(){ #任务条件选择菜单
|
||||
echo -e " 输入 1,4,0 代表\033[36m每周一、周四、周日\033[0m运行"
|
||||
echo -e " 输入 1-5 代表\033[36m周一至周五\033[0m运行"
|
||||
read -p "在每周哪天执行？ > " week
|
||||
week=`echo ${week/7/0}` #把7换成0
|
||||
week=`echo ${week/7/0}` # 把7换成0
|
||||
echo "-----------------------------------------------"
|
||||
read -p "想在该日的具体哪个小时执行？（0-23） > " hour
|
||||
cron_time="在每周$week的$hour点整"
|
||||
cron_time=`echo ${cron_time/周0/周日}` #把0换成日
|
||||
cron_time=`echo ${cron_time/周0/周日}` # 把0换成日
|
||||
[ -n "$week" ] && [ -n "$hour" ] && set_cron
|
||||
;;
|
||||
2)
|
||||
@@ -189,7 +201,7 @@ task_type(){ #任务条件选择菜单
|
||||
echo -e " 输入10即每隔10分钟运行一次，1440即每隔24小时运行一次"
|
||||
echo -e " 大于60分钟的数值将按小时取整,且按当前时区记时"
|
||||
read -p "想每隔多少分钟执行一次？（1-1440的整数） > " num
|
||||
if [ "$num" -lt 60 ];then
|
||||
if [ "$num" -lt 60 ]; then
|
||||
min="$num"
|
||||
cron_time="*/$min * * * *"
|
||||
time_des="$min分钟"
|
||||
@@ -255,12 +267,12 @@ task_manager() {
|
||||
;;
|
||||
[1-9] | [1-9][0-9])
|
||||
task_txt=$(sed -n "$num p" "$TMPDIR"/task_list)
|
||||
task_id=$(echo $task_txt | awk '{print $1}')
|
||||
task_id=$(echo "$task_txt" | awk '{print $1}')
|
||||
if [ "$task_id" = 0 ]; then
|
||||
read -p "旧版任务不支持管理，是否移除?(1/0) > " res
|
||||
[ "$res" = 1 ] && {
|
||||
cronname=$(echo "$task_txt" | awk -F '-' '{print $2}')
|
||||
croncmd -l >"$TMPDIR"/conf && sed -i "/$cronname/d" "$TMPDIR"/conf && croncmd $TMPDIR/conf
|
||||
croncmd -l >"$TMPDIR"/conf && sed -i "/$cronname/d" "$TMPDIR"/conf && croncmd "$TMPDIR"/conf
|
||||
sed -i "/$cronname/d" $clashdir/tools/cron 2>/dev/null
|
||||
rm -f "$TMPDIR"/conf
|
||||
}
|
||||
@@ -319,7 +331,8 @@ task_manager() {
|
||||
done
|
||||
}
|
||||
|
||||
task_recom(){ #任务推荐
|
||||
# 任务推荐
|
||||
task_recom() {
|
||||
echo "-----------------------------------------------"
|
||||
echo -e "\033[32m启用推荐的自动任务配置？这包括：\033[0m"
|
||||
echo "-----------------------------------------------"
|
||||
@@ -331,7 +344,7 @@ task_recom(){ #任务推荐
|
||||
[ "$res" = 1 ] && {
|
||||
set_service running "106" "运行时每10分钟自动保存面板配置" "*/10 * * * *"
|
||||
set_service afstart "107" "服务启动后自动同步ntp时间"
|
||||
cronset "在每日的3点0分重启服务" "0 3 * * * ${CRASHDIR}/task/task.sh 103 在每日的3点0分重启服务" && \
|
||||
cronset "在每日的3点0分重启服务" "0 3 * * * ${CRASHDIR}/task/task.sh 103 在每日的3点0分重启服务" &&
|
||||
echo -e "任务【在每日的3点0分重启服务】\033[32m添加成功！\033[0m"
|
||||
}
|
||||
}
|
||||
@@ -339,7 +352,7 @@ task_recom(){ #任务推荐
|
||||
# 任务菜单
|
||||
task_menu() {
|
||||
while true; do
|
||||
#检测并创建自定义任务文件
|
||||
# 检测并创建自定义任务文件
|
||||
[ -f "$CRASHDIR"/task/task.user ] || echo '#任务ID(必须>200并顺序排列)#任务命令#任务说明(#号隔开，任务命令和说明中都不允许包含#号)' >"$CRASHDIR"/task/task.user
|
||||
echo "-----------------------------------------------"
|
||||
echo -e "\033[30;47m欢迎使用自动任务功能：\033[0m"
|
||||
|
||||
Reference in New Issue
Block a user