🗡⛏fix errors

Scripts/sh/hhl.sh

@@ -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

Scripts/sh/ql.sh

@@ -154,9 +154,8 @@ opt
 read net
 if [ "$net" = "1" ]; then
     NETWORK="host"
-    CHANGE_NETWORK="--net $NETWORK"
+    MAPPING_JD_PORT=""
-else
+    MAPPING_NINJA_PORT=""
-    CHANGE_NETWORK=""
 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) 不映射"
+if [ "$NETWORK" = "bridge" ]; then
-opt
+    inp "是否映射端口：\n1) 映射[默认]\n2) 不映射"
-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) 不安装"
     opt
-    read Ninja
+    read port
-    if [ "$Ninja" = "2" ]; then
+    if [ "$port" = "2" ]; then
-        INSTALL_NINJA=false
+        MAPPING_JD_PORT=""
-        modify_ql_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

Scripts/sh/v2p.sh

@@ -172,23 +172,26 @@ opt
 read net
 if [ "$net" = "1" ]; then
     NETWORK="host"
-    CHANGE_NETWORK="--net $NETWORK"
+    MAPPING_V2P_PORT=""
-else
+    MAPPING_HTTP_PORT=""
-    CHANGE_NETWORK=""
+    MAPPING_REQUEST_PORT=""
 fi
 
-inp "是否修改端口[默认 8100|8101|8102]：\n1) 修改\n2) 不修改[默认]"
+if [ "$NETWORK" = "bridge" ]; then
-opt
+    inp "是否修改映射端口[默认 8100|8101|8102]：\n1) 修改\n2) 不修改[默认]"
-read change_port
+    opt
-if [ "$change_port" = "1" ]; then
+    read change_port
-    echo -n -e "\e[36m输入您想修改的 webUI 端口->\e[0m"
+    if [ "$change_port" = "1" ]; then
-    read V2P_PORT
+        echo -n -e "\e[36m输入您想修改的 webUI 端口->\e[0m"
-    echo -n -e "\e[36m输入您想修改的代理端口->\e[0m"
+        read V2P_PORT
-    read HTTP_PORT
+        echo -n -e "\e[36m输入您想修改的代理端口->\e[0m"
-    echo -n -e "\e[36m输入您想修改的代理请求查看端口->\e[0m"
+        read HTTP_PORT
-    read REQUEST_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    
+if [ "$port" != "2" ]; then
-    echo -n -e "\e[31m端口:$V2P_PORT 被占用，请重新输入 webUI 端口：\e[0m"
+    while check_port $V2P_PORT; do    
-    read V2P_PORT
+        echo -n -e "\e[31m端口:$V2P_PORT 被占用，请重新输入 webUI 端口：\e[0m"
-done
+        read V2P_PORT
-echo -e "\e[34m恭喜，端口:$V2P_PORT 可用\e[0m"
+    done
-while check_port $HTTP_PORT; do    
+    echo -e "\e[34m恭喜，端口:$V2P_PORT 可用\e[0m"
-    echo -n -e "\e[31m端口:$HTTP_PORT 被占用，请重新输入代理端口：\e[0m"
+    MAPPING_V2P_PORT="-p $V2P_PORT:80"
-    read HTTP_PORT
+    while check_port $HTTP_PORT; do    
-done
+        echo -n -e "\e[31m端口:$HTTP_PORT 被占用，请重新输入代理端口：\e[0m"
-echo -e "\e[34m恭喜，端口:$HTTP_PORT 可用\e[0m"
+        read HTTP_PORT
-while check_port $REQUEST_PORT; do    
+    done
-    echo -n -e "\e[31m端口:$REQUEST_PORT 被占用，请重新输入代理请求端口：\e[0m"
+    echo -e "\e[34m恭喜，端口:$HTTP_PORT 可用\e[0m"
-    read REQUEST_PORT
+    MAPPING_HTTP_PORT="-p $HTTP_PORT:8001"
-done
+    while check_port $REQUEST_PORT; do    
-echo -e "\e[34m恭喜，端口:$REQUEST_PORT 可用\e[0m"
+        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 \
+        $MAPPING_V2P_PORT \
-        -p $HTTP_PORT:8001 \
+        $MAPPING_HTTP_PORT \
-        -p $REQUEST_PORT:8002 \
+        $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 \
+        $MAPPING_V2P_PORT \
-        -p $HTTP_PORT:8001 \
+        $MAPPING_HTTP_PORT \
-        -p $REQUEST_PORT:8002 \
+        $MAPPING_REQUEST_PORT \
         --name $CONTAINER_NAME \
         --restart always \
-        $CHANGE_NETWORK \
+        --network $NETWORK \
         $DOCKER_IMG_NAME:$TAG
 }
 if [ $EXT_ALL = true ]; then

Scripts/sh/v4.sh

@@ -178,9 +178,7 @@ opt
 read net
 if [ "$net" = "1" ]; then
     NETWORK="host"
-    CHANGE_NETWORK="--net $NETWORK"
+    MAPPING_JD_PORT=""
-else
-    CHANGE_NETWORK=""
 fi
 
 inp "是否在启动容器时自动启动挂机程序：\n1) 开启[默认]\n2) 关闭"
@@ -214,14 +212,15 @@ modify_v4_port(){
         read JD_PORT
     fi
 }
-inp "根据设备是否映射端口：\n1) 映射[默认]\n2) 不映射"
+if [ "$NETWORK" = "bridge" ]; then
-opt
+    inp "是否映射端口：\n1) 映射[默认]\n2) 不映射"
-read port
+    opt
-if [ "$port" = "2" ]; then
+    read port
-    MAPPING_JD_PORT=""
+    if [ "$port" = "2" ]; then
-else
+        MAPPING_JD_PORT=""
-    CHANGE_NETWORK=""
+    else
-    modify_v4_port
+        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 \