diff --git a/docker/Dockerfile b/docker/Dockerfile index 758fbb54..025766b8 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -32,7 +32,6 @@ RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && git clone -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \ && git config --global user.email "qinglong@@users.noreply.github.com" \ && git config --global user.name "qinglong" \ - && git config --global pull.rebase true \ && cd ${QL_DIR} \ && cp -f .env.example .env \ && chmod 777 ${QL_DIR}/shell/*.sh \ diff --git a/shell/share.sh b/shell/share.sh index 81236684..17227aae 100755 --- a/shell/share.sh +++ b/shell/share.sh @@ -320,6 +320,7 @@ init_env detect_termux detect_macos define_cmd +fix_config echo '' > $task_error_log_path import_config $1 >> $task_error_log_path 2>&1 diff --git a/shell/update.sh b/shell/update.sh index 490b7f9f..f69d9a31 100755 --- a/shell/update.sh +++ b/shell/update.sh @@ -434,6 +434,7 @@ main() { local log_time=$(date "+%Y-%m-%d-%H-%M-%S") local log_path="$dir_log/update/${log_time}_$p1.log" local begin_time=$(date '+%Y-%m-%d %H:%M:%S') + case $p1 in update) echo -e "## 开始执行... $begin_time\n" >>$log_path