🗡⛏fix errors
This commit is contained in:
Leon
parent
122a41ad2e
commit
18d54533d4
@ -18,7 +18,6 @@ JD_PATH=""
|
||||
SHELL_FOLDER=$(pwd)
|
||||
CONTAINER_NAME=""
|
||||
TAG="latest"
|
||||
NETWORK="bridge"
|
||||
|
||||
HAS_IMAGE=false
|
||||
EXT_ALL=true
|
||||
@ -154,15 +153,6 @@ if [ "$watchtower" = "1" ]; then
|
||||
INSTALL_WATCH=true
|
||||
fi
|
||||
|
||||
inp "请选择容器的网络类型：\n1) host\n2) bridge[默认]"
|
||||
opt
|
||||
read net
|
||||
if [ "$net" = "1" ]; then
|
||||
NETWORK="host"
|
||||
CHANGE_NETWORK="--net $NETWORK"
|
||||
else
|
||||
CHANGE_NETWORK=""
|
||||
fi
|
||||
|
||||
# 配置已经创建完成，开始执行
|
||||
if [ $EXT_ALL = true ]; then
|
||||
@ -199,7 +189,6 @@ run_v(){
|
||||
-v $HHL_PATH:/scripts \
|
||||
--name $CONTAINER_NAME \
|
||||
--restart always \
|
||||
$CHANGE_NETWORK \
|
||||
$DOCKER_IMG_NAME:$TAG
|
||||
}
|
||||
run_nov(){
|
||||
@ -207,7 +196,6 @@ run_nov(){
|
||||
-t \
|
||||
--name $CONTAINER_NAME \
|
||||
--restart always \
|
||||
$CHANGE_NETWORK \
|
||||
$DOCKER_IMG_NAME:$TAG
|
||||
}
|
||||
if [ $EXT_ALL = true ]; then
|
||||
@ -238,4 +226,4 @@ log "5.薅薅乐使用说明：https://github.com/ClassmateLin/jd_scripts#readme
|
||||
|
||||
warn "6.请手动执行一次更新脚本命令 docker exec -it $CONTAINER_NAME /bin/docker-entrypoint"
|
||||
|
||||
log "结束后可点一下终端界面，然后按 Ctrl+C 退出\nenjoy!!!"
|
||||
log "结束后可点一下终端界面，然后按 Ctrl+C 退出\nenjoy!!!"
|
||||
@ -154,9 +154,8 @@ opt
|
||||
read net
|
||||
if [ "$net" = "1" ]; then
|
||||
NETWORK="host"
|
||||
CHANGE_NETWORK="--net $NETWORK"
|
||||
else
|
||||
CHANGE_NETWORK=""
|
||||
MAPPING_JD_PORT=""
|
||||
MAPPING_NINJA_PORT=""
|
||||
fi
|
||||
|
||||
inp "是否在启动容器时自动启动挂机程序：\n1) 开启[默认]\n2) 关闭"
|
||||
@ -173,6 +172,14 @@ if [ "$pannel" = "2" ]; then
|
||||
ENABLE_WEB_PANNEL_ENV=""
|
||||
fi
|
||||
|
||||
inp "是否安装 Ninja：\n1) 安装[默认]\n2) 不安装"
|
||||
opt
|
||||
read Ninja
|
||||
if [ "$Ninja" = "2" ]; then
|
||||
INSTALL_NINJA=false
|
||||
MAPPING_NINJA_PORT=""
|
||||
fi
|
||||
|
||||
# 端口问题
|
||||
modify_ql_port(){
|
||||
inp "是否修改青龙端口[默认 5700]：\n1) 修改\n2) 不修改[默认]"
|
||||
@ -192,21 +199,12 @@ modify_Ninja_port(){
|
||||
read NINJA_PORT
|
||||
fi
|
||||
}
|
||||
inp "根据设备是否映射端口：\n1) 映射[默认]\n2) 不映射"
|
||||
opt
|
||||
read port
|
||||
if [ "$port" = "2" ]; then
|
||||
MAPPING_JD_PORT=""
|
||||
MAPPING_NINJA_PORT=""
|
||||
else
|
||||
CHANGE_NETWORK=""
|
||||
MAPPING_JD_PORT="-p $JD_PORT:5700"
|
||||
inp "是否安装 Ninja，若已存在则强制重装：\n1) 安装[默认]\n2) 不安装"
|
||||
if [ "$NETWORK" = "bridge" ]; then
|
||||
inp "是否映射端口：\n1) 映射[默认]\n2) 不映射"
|
||||
opt
|
||||
read Ninja
|
||||
if [ "$Ninja" = "2" ]; then
|
||||
INSTALL_NINJA=false
|
||||
modify_ql_port
|
||||
read port
|
||||
if [ "$port" = "2" ]; then
|
||||
MAPPING_JD_PORT=""
|
||||
MAPPING_NINJA_PORT=""
|
||||
else
|
||||
modify_ql_port
|
||||
@ -279,7 +277,7 @@ docker run -dit \
|
||||
--name $CONTAINER_NAME \
|
||||
--hostname qinglong \
|
||||
--restart always \
|
||||
$CHANGE_NETWORK \
|
||||
--network $NETWORK \
|
||||
$ENABLE_HANGUP_ENV \
|
||||
$ENABLE_WEB_PANEL_ENV \
|
||||
$DOCKER_IMG_NAME:$TAG
|
||||
@ -369,4 +367,4 @@ else
|
||||
exit 0
|
||||
fi
|
||||
|
||||
log "全面部署已完成！enjoy!!!"
|
||||
log "全面部署已完成！enjoy!!!"
|
||||
@ -172,23 +172,26 @@ opt
|
||||
read net
|
||||
if [ "$net" = "1" ]; then
|
||||
NETWORK="host"
|
||||
CHANGE_NETWORK="--net $NETWORK"
|
||||
else
|
||||
CHANGE_NETWORK=""
|
||||
MAPPING_V2P_PORT=""
|
||||
MAPPING_HTTP_PORT=""
|
||||
MAPPING_REQUEST_PORT=""
|
||||
fi
|
||||
|
||||
inp "是否修改端口[默认 8100|8101|8102]：\n1) 修改\n2) 不修改[默认]"
|
||||
opt
|
||||
read change_port
|
||||
if [ "$change_port" = "1" ]; then
|
||||
echo -n -e "\e[36m输入您想修改的 webUI 端口->\e[0m"
|
||||
read V2P_PORT
|
||||
echo -n -e "\e[36m输入您想修改的代理端口->\e[0m"
|
||||
read HTTP_PORT
|
||||
echo -n -e "\e[36m输入您想修改的代理请求查看端口->\e[0m"
|
||||
read REQUEST_PORT
|
||||
if [ "$NETWORK" = "bridge" ]; then
|
||||
inp "是否修改映射端口[默认 8100|8101|8102]：\n1) 修改\n2) 不修改[默认]"
|
||||
opt
|
||||
read change_port
|
||||
if [ "$change_port" = "1" ]; then
|
||||
echo -n -e "\e[36m输入您想修改的 webUI 端口->\e[0m"
|
||||
read V2P_PORT
|
||||
echo -n -e "\e[36m输入您想修改的代理端口->\e[0m"
|
||||
read HTTP_PORT
|
||||
echo -n -e "\e[36m输入您想修改的代理请求查看端口->\e[0m"
|
||||
read REQUEST_PORT
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
# 配置已经创建完成，开始执行
|
||||
if [ $EXT_ALL = true ]; then
|
||||
log "1.开始创建配置文件目录"
|
||||
@ -224,21 +227,26 @@ check_port() {
|
||||
echo "正在检测端口:$1"
|
||||
netstat -tlpn | grep "\b$1\b"
|
||||
}
|
||||
while check_port $V2P_PORT; do
|
||||
echo -n -e "\e[31m端口:$V2P_PORT 被占用，请重新输入 webUI 端口：\e[0m"
|
||||
read V2P_PORT
|
||||
done
|
||||
echo -e "\e[34m恭喜，端口:$V2P_PORT 可用\e[0m"
|
||||
while check_port $HTTP_PORT; do
|
||||
echo -n -e "\e[31m端口:$HTTP_PORT 被占用，请重新输入代理端口：\e[0m"
|
||||
read HTTP_PORT
|
||||
done
|
||||
echo -e "\e[34m恭喜，端口:$HTTP_PORT 可用\e[0m"
|
||||
while check_port $REQUEST_PORT; do
|
||||
echo -n -e "\e[31m端口:$REQUEST_PORT 被占用，请重新输入代理请求端口：\e[0m"
|
||||
read REQUEST_PORT
|
||||
done
|
||||
echo -e "\e[34m恭喜，端口:$REQUEST_PORT 可用\e[0m"
|
||||
if [ "$port" != "2" ]; then
|
||||
while check_port $V2P_PORT; do
|
||||
echo -n -e "\e[31m端口:$V2P_PORT 被占用，请重新输入 webUI 端口：\e[0m"
|
||||
read V2P_PORT
|
||||
done
|
||||
echo -e "\e[34m恭喜，端口:$V2P_PORT 可用\e[0m"
|
||||
MAPPING_V2P_PORT="-p $V2P_PORT:80"
|
||||
while check_port $HTTP_PORT; do
|
||||
echo -n -e "\e[31m端口:$HTTP_PORT 被占用，请重新输入代理端口：\e[0m"
|
||||
read HTTP_PORT
|
||||
done
|
||||
echo -e "\e[34m恭喜，端口:$HTTP_PORT 可用\e[0m"
|
||||
MAPPING_HTTP_PORT="-p $HTTP_PORT:8001"
|
||||
while check_port $REQUEST_PORT; do
|
||||
echo -n -e "\e[31m端口:$REQUEST_PORT 被占用，请重新输入代理请求端口：\e[0m"
|
||||
read REQUEST_PORT
|
||||
done
|
||||
echo -e "\e[34m恭喜，端口:$REQUEST_PORT 可用\e[0m"
|
||||
MAPPING_REQUEST_PORT="-p $REQUEST_PORT:8002"
|
||||
fi
|
||||
|
||||
|
||||
log "3.开始创建容器并执行"
|
||||
@ -246,9 +254,9 @@ run_v(){
|
||||
docker run -dit \
|
||||
-t \
|
||||
-e TZ=Asia/Shanghai \
|
||||
-p $V2P_PORT:80 \
|
||||
-p $HTTP_PORT:8001 \
|
||||
-p $REQUEST_PORT:8002 \
|
||||
$MAPPING_V2P_PORT \
|
||||
$MAPPING_HTTP_PORT \
|
||||
$MAPPING_REQUEST_PORT \
|
||||
-v $JSFILE_PATH:/usr/local/app/script/JSFile \
|
||||
-v $LISTS_PATH:/usr/local/app/script/Lists \
|
||||
-v $STORE_PATH:/usr/local/app/script/Store \
|
||||
@ -257,19 +265,19 @@ run_v(){
|
||||
-v $EFSS_PATH:/usr/local/app/efss \
|
||||
--name $CONTAINER_NAME \
|
||||
--restart always \
|
||||
$CHANGE_NETWORK \
|
||||
--network $NETWORK \
|
||||
$DOCKER_IMG_NAME:$TAG
|
||||
}
|
||||
run_nov(){
|
||||
docker run -dit \
|
||||
-t \
|
||||
-e TZ=Asia/Shanghai \
|
||||
-p $V2P_PORT:80 \
|
||||
-p $HTTP_PORT:8001 \
|
||||
-p $REQUEST_PORT:8002 \
|
||||
$MAPPING_V2P_PORT \
|
||||
$MAPPING_HTTP_PORT \
|
||||
$MAPPING_REQUEST_PORT \
|
||||
--name $CONTAINER_NAME \
|
||||
--restart always \
|
||||
$CHANGE_NETWORK \
|
||||
--network $NETWORK \
|
||||
$DOCKER_IMG_NAME:$TAG
|
||||
}
|
||||
if [ $EXT_ALL = true ]; then
|
||||
|
||||
@ -178,9 +178,7 @@ opt
|
||||
read net
|
||||
if [ "$net" = "1" ]; then
|
||||
NETWORK="host"
|
||||
CHANGE_NETWORK="--net $NETWORK"
|
||||
else
|
||||
CHANGE_NETWORK=""
|
||||
MAPPING_JD_PORT=""
|
||||
fi
|
||||
|
||||
inp "是否在启动容器时自动启动挂机程序：\n1) 开启[默认]\n2) 关闭"
|
||||
@ -214,14 +212,15 @@ modify_v4_port(){
|
||||
read JD_PORT
|
||||
fi
|
||||
}
|
||||
inp "根据设备是否映射端口：\n1) 映射[默认]\n2) 不映射"
|
||||
opt
|
||||
read port
|
||||
if [ "$port" = "2" ]; then
|
||||
MAPPING_JD_PORT=""
|
||||
else
|
||||
CHANGE_NETWORK=""
|
||||
modify_v4_port
|
||||
if [ "$NETWORK" = "bridge" ]; then
|
||||
inp "是否映射端口：\n1) 映射[默认]\n2) 不映射"
|
||||
opt
|
||||
read port
|
||||
if [ "$port" = "2" ]; then
|
||||
MAPPING_JD_PORT=""
|
||||
else
|
||||
modify_v4_port
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@ -288,7 +287,7 @@ docker run -dit \
|
||||
--name $CONTAINER_NAME \
|
||||
--hostname v4 \
|
||||
--restart always \
|
||||
$CHANGE_NETWORK \
|
||||
--network $NETWORK \
|
||||
$ENABLE_HANGUP_ENV \
|
||||
$ENABLE_BOT_ENV \
|
||||
$ENABLE_WEB_PANEL_ENV \
|
||||
@ -334,4 +333,4 @@ log "6.安装已经完成。创建好后请阅读映射的 config 目录下的
|
||||
log "7.如果启用了 ENABLE_TG_BOT，创建好后请阅读映射的 config 目录下的的 config.sh 和 bot.json，并根据说明修改，首次创建并不会启动 bot，修改好 bot.json 后请重启容器。"
|
||||
log "命令提示：\njtask mtask otask 链接的都是同一个脚本，m=my，o=own，j=jd。三者区分仅用在 crontab.list 中，以区别不同类型任务，手动运行直接 jtask 即可。\ndocker exec $CONTAINER_NAME jtask # 运行 scripts 脚本\ndocker exec $CONTAINER_NAME otask # 运行 own 脚本\ndocker exec $CONTAINER_NAME mtask # 运行你自己的脚本，如果某些 own 脚本识别不出来 cron，你也可以自行添加 mtask 任务\ndocker exec $CONTAINER_NAME jlog # 删除旧日志\ndocker exec $CONTAINER_NAME jup # 更新所有脚本\ndocker exec $CONTAINER_NAME jcode # 导出所有互助码\ndocker exec $CONTAINER_NAME jcsv # 记录豆豆变化情况"
|
||||
|
||||
log "enjoy!!!"
|
||||
log "enjoy!!!"
|
||||
Loading…
Reference in New Issue
Block a user