From be28a343490636470a2d386db2927912b9a5128e Mon Sep 17 00:00:00 2001 From: renfenghuan <64941682+renfenghuan@users.noreply.github.com> Date: Fri, 18 Dec 2020 10:45:52 +0000 Subject: [PATCH] fix bug in the shell MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 少写了个分号; 不能用sh,要用source,否则无法继承环境变量 --- docker/default_task.sh | 4 ++-- docker/docker_entrypoint.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/default_task.sh b/docker/default_task.sh index 58d937ca..b04ebeee 100644 --- a/docker/default_task.sh +++ b/docker/default_task.sh @@ -107,9 +107,9 @@ if [ $(grep -c "default_task.sh" $mergedListFile) -eq '0' ]; then echo "52 */1 * * * sh /scripts/docker/default_task.sh |ts >> /scripts/logs/default_task.log 2>&1" >>$mergedListFile fi -if [ $RANDOM_DELAY_MAX -ge 1 ] then +if [ $RANDOM_DELAY_MAX -ge 1 ]; then echo "已设置随机延迟为 $RANDOM_DELAY_MAX , 设置延迟任务中... " - sh replaceNode_withRandomSleep.sh $mergedListFile + source replaceNode_withRandomSleep.sh $mergedListFile fi echo "加载最新的定时任务文件..." diff --git a/docker/docker_entrypoint.sh b/docker/docker_entrypoint.sh index 1f774043..002b9ff5 100644 --- a/docker/docker_entrypoint.sh +++ b/docker/docker_entrypoint.sh @@ -128,9 +128,9 @@ if [ $(grep -c "default_task.sh" $mergedListFile) -eq '0' ]; then echo "52 */1 * * * sh /scripts/docker/default_task.sh |ts >> /scripts/logs/default_task.log 2>&1" >>$mergedListFile fi -if [ $RANDOM_DELAY_MAX -ge 1 ] then +if [ $RANDOM_DELAY_MAX -ge 1 ]; then echo "已设置随机延迟为 $RANDOM_DELAY_MAX , 设置延迟任务中... " - sh replaceNode_withRandomSleep.sh $mergedListFile + source replaceNode_withRandomSleep.sh $mergedListFile fi echo "Load the latest crontab task file..."