From 1d47cbe3512188942a8e064ca41272f39b56e31d Mon Sep 17 00:00:00 2001
From: Xinglin Qiang <xinglinqiang@gmail.com>
Date: Fri, 22 Jan 2021 11:29:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=BF=9C=E7=A8=8B=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/default_task.sh | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/docker/default_task.sh b/docker/default_task.sh
index 589700bd..5220e00c 100644
--- a/docker/default_task.sh
+++ b/docker/default_task.sh
@@ -4,10 +4,6 @@ set -e
 echo "定义定时任务合并处理用到的文件路径..."
 defaultListFile="/scripts/docker/$DEFAULT_LIST_FILE"
 echo "默认文件定时任务文件路径为 ${defaultListFile}"
-if [ $CUSTOM_LIST_FILE ]; then
-    customListFile="/scripts/docker/$CUSTOM_LIST_FILE"
-    echo "自定义定时任务文件路径为 ${customListFile}"
-fi
 mergedListFile="/scripts/docker/merged_list_file.sh"
 echo "合并后定时任务文件路径为 ${mergedListFile}"
 
@@ -17,6 +13,18 @@ cat $defaultListFile >$mergedListFile
 echo "第2步判断是否存在自定义任务任务列表并追加..."
 if [ $CUSTOM_LIST_FILE ]; then
     echo "您配置了自定义任务文件：$CUSTOM_LIST_FILE，自定义任务类型为：$CUSTOM_LIST_MERGE_TYPE..."
+    # 无论远程还是本地挂载, 均复制到 $customListFile
+    customListFile="/scripts/docker/custom_list_file.sh"
+    echo "自定义定时任务文件临时工作路径为 ${customListFile}"
+    if expr "$CUSTOM_LIST_FILE" : 'http.*' &>/dev/null; then
+        echo "自定义任务文件为远程脚本，开始下载自定义远程任务。"
+        wget -O $customListFile $CUSTOM_LIST_FILE
+        echo "下载完成..."
+    elif [ -f /scripts/docker/$CUSTOM_LIST_FILE ]; then
+        echo "自定义任务文件为本地挂载。"
+        cp /scripts/docker/$CUSTOM_LIST_FILE $customListFile
+    fi
+
     if [ -f "$customListFile" ]; then
         if [ $CUSTOM_LIST_MERGE_TYPE == "append" ]; then
             echo "合并默认定时任务文件：$DEFAULT_LIST_FILE 和 自定义定时任务文件：$CUSTOM_LIST_FILE"
@@ -62,7 +70,7 @@ if [ 0"$CUSTOM_SHELL_FILE" = "0" ]; then
     echo "未配置自定shell脚本文件，跳过执行。"
 else
     if expr "$CUSTOM_SHELL_FILE" : 'http.*' &>/dev/null; then
-        echo "自定义shell脚本为远程脚本，开始下在自定义远程脚本。"
+        echo "自定义shell脚本为远程脚本，开始下载自定义远程脚本。"
         wget -O /scripts/docker/shell_script_mod.sh $CUSTOM_SHELL_FILE
         echo "下载完成，开始执行..."
         echo "#远程自定义shell脚本追加定时任务" >>$mergedListFile