From 05588e88ac29bbdcbc4ac8ff1eec186720d606ed Mon Sep 17 00:00:00 2001 From: whyour Date: Sat, 1 May 2021 22:59:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dshare=20shell=E5=BC=95?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/Dockerfile | 2 +- docker/docker-entrypoint.sh | 1 + shell/code.sh | 1 + shell/rmlog.sh | 1 + shell/task.sh | 1 + shell/update.sh | 5 +++-- 6 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 2796a620..05db5bda 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,7 @@ FROM node:lts-alpine LABEL maintainer="whyour" ARG QL_URL=https://github.com.cnpmjs.org/whyour/qinglong -ARG QL_BRANCH=master +ARG QL_BRANCH=dev ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \ LANG=zh_CN.UTF-8 \ SHELL=/bin/bash \ diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index e2b5a42e..723f0f4c 100644 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -2,6 +2,7 @@ set -e echo -e "======================1. 初始化命令========================\n" +dir_shell=/ql/shell . $dir_shell/share.sh link_shell echo diff --git a/shell/code.sh b/shell/code.sh index b9fcf469..ab80556d 100644 --- a/shell/code.sh +++ b/shell/code.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash ## 导入通用变量与函数 +dir_shell=/ql/shell . $dir_shell/share.sh ## 导入配置文件 diff --git a/shell/rmlog.sh b/shell/rmlog.sh index 3a77ecbf..1ca603fd 100755 --- a/shell/rmlog.sh +++ b/shell/rmlog.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash ## 导入通用变量与函数 +dir_shell=/ql/shell . $dir_shell/share.sh ## 导入配置文件 diff --git a/shell/task.sh b/shell/task.sh index f9448348..0103d09d 100755 --- a/shell/task.sh +++ b/shell/task.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash ## 导入通用变量与函数 +dir_shell=/ql/shell . $dir_shell/share.sh ## 组合Cookie和互助码子程序，$1：要组合的内容 diff --git a/shell/update.sh b/shell/update.sh index dcca559e..ef2b3c31 100755 --- a/shell/update.sh +++ b/shell/update.sh @@ -1,11 +1,12 @@ #!/usr/bin/env bash -send_mark=$dir_shell/send_mark - # 导入通用变量与函数 +dir_shell=/ql/shell . $dir_shell/share.sh . $dir_shell/api.sh +send_mark=$dir_shell/send_mark + get_token ## 重置仓库remote url，docker专用，$1：要重置的目录，$2：要重置为的网址