mirror of
https://github.com/whyour/qinglong.git
synced 2026-07-01 04:40:38 +08:00
基础命令重构
1. 移除命令中 bash 依赖 2. jd命令重命名为js 3. 修改默认初始目录 4. 移除冗余代码
This commit is contained in:
+18
-18
@@ -2,34 +2,34 @@
|
||||
set -e
|
||||
|
||||
echo -e "======================1. 检测配置文件========================\n"
|
||||
[ ! -d ${JD_DIR}/config ] && mkdir -p ${JD_DIR}/config
|
||||
[ ! -d ${QL_DIR}/config ] && mkdir -p ${QL_DIR}/config
|
||||
|
||||
if [ ! -s ${JD_DIR}/config/crontab.list ]
|
||||
if [ ! -s ${QL_DIR}/config/crontab.list ]
|
||||
then
|
||||
echo -e "检测到config配置目录下不存在crontab.list或存在但文件为空,从示例文件复制一份用于初始化...\n"
|
||||
cp -fv ${JD_DIR}/sample/crontab.list.sample ${JD_DIR}/config/crontab.list
|
||||
sed -i "s,MY_PATH,${JD_DIR},g" ${JD_DIR}/config/crontab.list
|
||||
sed -i "s,ENV_PATH=,PATH=$PATH,g" ${JD_DIR}/config/crontab.list
|
||||
cp -fv ${QL_DIR}/sample/crontab.list.sample ${QL_DIR}/config/crontab.list
|
||||
sed -i "s,MY_PATH,${QL_DIR},g" ${QL_DIR}/config/crontab.list
|
||||
sed -i "s,ENV_PATH=,PATH=$PATH,g" ${QL_DIR}/config/crontab.list
|
||||
fi
|
||||
crond
|
||||
crontab ${JD_DIR}/config/crontab.list
|
||||
crontab ${QL_DIR}/config/crontab.list
|
||||
echo -e "成功添加定时任务...\n"
|
||||
|
||||
if [ ! -s ${JD_DIR}/config/cookie.sh ]; then
|
||||
if [ ! -s ${QL_DIR}/config/cookie.sh ]; then
|
||||
echo -e "检测到config配置目录下不存在config.sh,从示例文件复制一份用于初始化...\n"
|
||||
touch ${JD_DIR}/config/cookie.sh
|
||||
touch ${QL_DIR}/config/cookie.sh
|
||||
echo
|
||||
fi
|
||||
|
||||
if [ ! -s ${JD_DIR}/config/config.sh ]; then
|
||||
if [ ! -s ${QL_DIR}/config/config.sh ]; then
|
||||
echo -e "检测到config配置目录下不存在config.sh,从示例文件复制一份用于初始化...\n"
|
||||
cp -fv ${JD_DIR}/sample/config.sh.sample ${JD_DIR}/config/config.sh
|
||||
cp -fv ${QL_DIR}/sample/config.sh.sample ${QL_DIR}/config/config.sh
|
||||
echo
|
||||
fi
|
||||
|
||||
if [ ! -s ${JD_DIR}/config/auth.json ]; then
|
||||
if [ ! -s ${QL_DIR}/config/auth.json ]; then
|
||||
echo -e "检测到config配置目录下不存在auth.json,从示例文件复制一份用于初始化...\n"
|
||||
cp -fv ${JD_DIR}/sample/auth.json ${JD_DIR}/config/auth.json
|
||||
cp -fv ${QL_DIR}/sample/auth.json ${QL_DIR}/config/auth.json
|
||||
echo
|
||||
fi
|
||||
|
||||
@@ -39,29 +39,29 @@ if [ -s /etc/nginx/conf.d/default.conf ]; then
|
||||
echo
|
||||
fi
|
||||
|
||||
cp -fv ${JD_DIR}/docker/front.conf /etc/nginx/conf.d/front.conf
|
||||
cp -fv ${QL_DIR}/docker/front.conf /etc/nginx/conf.d/front.conf
|
||||
|
||||
echo -e "======================2. 启动nginx========================\n"
|
||||
nginx -c /etc/nginx/nginx.conf
|
||||
echo
|
||||
|
||||
echo -e "======================3. 更新源代码========================\n"
|
||||
bash ${JD_DIR}/shell/git_pull.sh
|
||||
git_pull
|
||||
echo
|
||||
|
||||
echo -e "======================4. 启动挂机程序========================\n"
|
||||
CookieConf=${JD_DIR}/config/cookie.sh
|
||||
. ${JD_DIR}/config/config.sh
|
||||
CookieConf=${QL_DIR}/config/cookie.sh
|
||||
. ${QL_DIR}/config/config.sh
|
||||
. ${CookieConf}
|
||||
if [ -s ${CookieConf} ]; then
|
||||
bash ${JD_DIR}/shell/jd.sh hangup 2>/dev/null
|
||||
js hangup 2>/dev/null
|
||||
echo -e "挂机程序启动成功...\n"
|
||||
else
|
||||
echo -e "尚未在Cookie管理中添加一条Cookie,可能是首次部署容器,因此不启动挂机程序...\n"
|
||||
fi
|
||||
|
||||
echo -e "======================5. 启动控制面板========================\n"
|
||||
pm2 start ${JD_DIR}/build/app.js -n panel
|
||||
pm2 start ${QL_DIR}/build/app.js -n panel
|
||||
echo -e "控制面板启动成功...\n"
|
||||
|
||||
echo -e "\n容器启动成功...\n"
|
||||
|
||||
Reference in New Issue
Block a user