@whyour/qinglong 2.17.10-rc.3 → 2.17.10-rc.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyour/qinglong",
-  "version": "2.17.10-rc.3",
+  "version": "2.17.10-rc.4",
   "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
   "repository": {
     "type": "git",

package/shell/otask.sh

@@ -269,6 +269,7 @@ check_file "${task_shell_params[@]}"
 if [[ $isJsOrPythonFile == 'false' ]]; then
   run_task_before "${task_shell_params[@]}"
 fi
+set_u_on="false"
 if set -o | grep -q 'nounset.*on'; then
   set_u_on="true"
   set +u

package/shell/share.sh

@@ -451,9 +451,9 @@ handle_task_start() {
 run_task_before() {
   . $file_task_before "$@"
 
-  if [[ $task_before ]]; then
+  if [[ ${task_before:=} ]]; then
     echo -e "执行前置命令\n"
-    eval "$task_before" "$@"
+    eval "${task_before%;}" "$@"
     echo -e "\n执行前置命令结束\n"
   fi
 }
@@ -463,7 +463,7 @@ run_task_after() {
 
   if [[ ${task_after:=} ]]; then
     echo -e "\n执行后置命令\n"
-    eval "$task_after" "$@"
+    eval "${task_after%;}" "$@"
     echo -e "\n执行后置命令结束"
   fi
 }

package/static/build/services/cron.js

@@ -462,11 +462,13 @@ let CronService = class CronService {
         if (tab.task_before) {
             commandVariable += `task_before='${tab.task_before
                 .replace(/'/g, "'\\''")
+                .replace(/;? *\n/g, ';')
                 .trim()}' `;
         }
         if (tab.task_after) {
             commandVariable += `task_after='${tab.task_after
                 .replace(/'/g, "'\\''")
+                .replace(/;? *\n/g, ';')
                 .trim()}' `;
         }
         const crontab_job_string = `${commandVariable}${command}`;