From 53581d48fc4feb75c03c9a4967ae826b208afd3d Mon Sep 17 00:00:00 2001
From: spiritlhl <103393591+spiritLHLS@users.noreply.github.com>
Date: Fri, 8 Dec 2023 21:16:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=A4=E6=96=AD=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E6=98=AF=E5=90=A6=E6=98=AF=E9=80=9A=E8=BF=87docker?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85=E7=9A=84=E9=80=BB=E8=BE=91=20(#311)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 更新判断面板是否是通过docker安装的逻辑

* Updated logic for determining whether a panel is installed via docker or not
---
 script/install.sh    | 29 ++++++++++++++++++++++-------
 script/install_en.sh | 29 ++++++++++++++++++++++-------
 2 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/script/install.sh b/script/install.sh
index c4b5e06..ef10e2e 100755
--- a/script/install.sh
+++ b/script/install.sh
@@ -797,14 +797,29 @@ select_version() {
     DOCKER_COMPOSE_COMMAND=""
     if docker compose version >/dev/null 2>&1; then
         DOCKER_COMPOSE_COMMAND="docker compose"
+        if $DOCKER_COMPOSE_COMMAND ls | grep -qw "$NZ_DASHBOARD_PATH/docker-compose.yaml" >/dev/null 2>&1; then
+            NEZHA_IMAGES=$(docker images --format "{{.Repository}}:{{.Tag}}" | grep -w "nezha-dashboard")
+            if [ -n "$NEZHA_IMAGES" ]; then
+                echo "存在带有 nezha-dashboard 仓库的 Docker 镜像："
+                echo "$NEZHA_IMAGES"
+                IS_DOCKER_NEZHA=1
+                return
+            else
+                echo "未找到带有 nezha-dashboard 仓库的 Docker 镜像。"
+            fi
+        fi
     elif command -v docker-compose >/dev/null 2>&1; then
         DOCKER_COMPOSE_COMMAND="docker-compose"
-    fi
-
-    if [[ -n $DOCKER_COMPOSE_COMMAND ]]; then
-        if $DOCKER_COMPOSE_COMMAND ls | grep -qw "$NZ_DASHBOARD_PATH/docker-compose.yaml" >/dev/null 2>&1; then
-            IS_DOCKER_NEZHA=1
-            return
+        if $DOCKER_COMPOSE_COMMAND -f "$NZ_DASHBOARD_PATH/docker-compose.yaml" config >/dev/null 2>&1; then
+            NEZHA_IMAGES=$(docker images --format "{{.Repository}}:{{.Tag}}" | grep -w "nezha-dashboard")
+            if [ -n "$NEZHA_IMAGES" ]; then
+                echo "存在带有 nezha-dashboard 仓库的 Docker 镜像："
+                echo "$NEZHA_IMAGES"
+                IS_DOCKER_NEZHA=1
+                return
+            else
+                echo "未找到带有 nezha-dashboard 仓库的 Docker 镜像。"
+            fi
         fi
     fi
 
@@ -1106,4 +1121,4 @@ if [[ $# > 0 ]]; then
 else
     select_version
     show_menu
-fi
\ No newline at end of file
+fi
diff --git a/script/install_en.sh b/script/install_en.sh
index 3b6874f..68ce5a7 100755
--- a/script/install_en.sh
+++ b/script/install_en.sh
@@ -795,14 +795,29 @@ select_version() {
     DOCKER_COMPOSE_COMMAND=""
     if docker compose version >/dev/null 2>&1; then
         DOCKER_COMPOSE_COMMAND="docker compose"
+        if $DOCKER_COMPOSE_COMMAND ls | grep -qw "$NZ_DASHBOARD_PATH/docker-compose.yaml" >/dev/null 2>&1; then
+            NEZHA_IMAGES=$(docker images --format "{{.Repository}}:{{.Tag}}" | grep -w "nezha-dashboard")
+            if [ -n "$NEZHA_IMAGES" ]; then
+                echo "Docker image with nezha-dashboard repository exists:"
+                echo "$NEZHA_IMAGES"
+                IS_DOCKER_NEZHA=1
+                return
+            else
+                echo "No Docker images with the nezha-dashboard repository were found."
+            fi
+        fi
     elif command -v docker-compose >/dev/null 2>&1; then
         DOCKER_COMPOSE_COMMAND="docker-compose"
-    fi
-
-    if [[ -n $DOCKER_COMPOSE_COMMAND ]]; then
-        if $DOCKER_COMPOSE_COMMAND ls | grep -qw "$NZ_DASHBOARD_PATH/docker-compose.yaml" >/dev/null 2>&1; then
-            IS_DOCKER_NEZHA=1
-            return
+        if $DOCKER_COMPOSE_COMMAND -f "$NZ_DASHBOARD_PATH/docker-compose.yaml" config >/dev/null 2>&1; then
+            NEZHA_IMAGES=$(docker images --format "{{.Repository}}:{{.Tag}}" | grep -w "nezha-dashboard")
+            if [ -n "$NEZHA_IMAGES" ]; then
+                echo "Docker image with nezha-dashboard repository exists:"
+                echo "$NEZHA_IMAGES"
+                IS_DOCKER_NEZHA=1
+                return
+            else
+                echo "No Docker images with the nezha-dashboard repository were found."
+            fi
         fi
     fi
 
@@ -1102,4 +1117,4 @@ if [[ $# > 0 ]]; then
 else
     select_version
     show_menu
-fi
\ No newline at end of file
+fi