fix: docker image detection (#29)

nezhahq · Dec 3, 2024 · 3d31005 · 3d31005
1 parent c6c7dd5
commit 3d31005
Show file tree

Hide file tree

Showing 8 changed files with 141 additions and 141 deletions.
diff --git a/install.sh b/install.sh
@@ -125,29 +125,29 @@ installation_check() {
     if docker compose version >/dev/null 2>&1; then
         DOCKER_COMPOSE_COMMAND="docker compose"
         if sudo $DOCKER_COMPOSE_COMMAND ls | grep -qw "$NZ_DASHBOARD_PATH/docker-compose.yaml" >/dev/null 2>&1; then
-            NEZHA_IMAGES=$(sudo docker images --format "{{.Repository}}":"{{.Tag}}" | grep -w "nezha-dashboard")
+            NEZHA_IMAGES=$(sudo docker images --format "{{.Repository}}":"{{.Tag}}" | grep -w "nezhahq/nezha")
             if [ -n "$NEZHA_IMAGES" ]; then
-                echo "存在带有 nezha-dashboard 仓库的 Docker 镜像："
+                echo "存在带有 nezha 仓库的 Docker 镜像："
                 echo "$NEZHA_IMAGES"
                 IS_DOCKER_NEZHA=1
                 FRESH_INSTALL=0
                 return
             else
-                echo "未找到带有 nezha-dashboard 仓库的 Docker 镜像。"
+                echo "未找到带有 nezha 仓库的 Docker 镜像。"
             fi
         fi
     elif command -v docker-compose >/dev/null 2>&1; then
         DOCKER_COMPOSE_COMMAND="docker-compose"
         if sudo $DOCKER_COMPOSE_COMMAND -f "$NZ_DASHBOARD_PATH/docker-compose.yaml" config >/dev/null 2>&1; then
-            NEZHA_IMAGES=$(sudo docker images --format "{{.Repository}}":"{{.Tag}}" | grep -w "nezha-dashboard")
+            NEZHA_IMAGES=$(sudo docker images --format "{{.Repository}}":"{{.Tag}}" | grep -w "nezhahq/nezha")
             if [ -n "$NEZHA_IMAGES" ]; then
-                echo "存在带有 nezha-dashboard 仓库的 Docker 镜像："
+                echo "存在带有 nezha 仓库的 Docker 镜像："
                 echo "$NEZHA_IMAGES"
                 IS_DOCKER_NEZHA=1
                 FRESH_INSTALL=0
                 return
             else
-                echo "未找到带有 nezha-dashboard 仓库的 Docker 镜像。"
+                echo "未找到带有 nezha 仓库的 Docker 镜像。"
             fi
         fi
     fi

diff --git a/install_en.sh b/install_en.sh
@@ -125,29 +125,29 @@ installation_check() {
     if docker compose version >/dev/null 2>&1; then
         DOCKER_COMPOSE_COMMAND="docker compose"
         if sudo $DOCKER_COMPOSE_COMMAND ls | grep -qw "$NZ_DASHBOARD_PATH/docker-compose.yaml" >/dev/null 2>&1; then
-            NEZHA_IMAGES=$(sudo docker images --format "{{.Repository}}":"{{.Tag}}" | grep -w "nezha-dashboard")
+            NEZHA_IMAGES=$(sudo docker images --format "{{.Repository}}":"{{.Tag}}" | grep -w "nezhahq/nezha")
             if [ -n "$NEZHA_IMAGES" ]; then
-                echo "Docker image with nezha-dashboard repository exists:"
+                echo "Docker image with nezha repository exists:"
                 echo "$NEZHA_IMAGES"
                 IS_DOCKER_NEZHA=1
                 FRESH_INSTALL=0
                 return
             else
-                echo "No Docker images with the nezha-dashboard repository were found."
+                echo "No Docker images with the nezha repository were found."
             fi
         fi
     elif command -v docker-compose >/dev/null 2>&1; then
         DOCKER_COMPOSE_COMMAND="docker-compose"
         if sudo $DOCKER_COMPOSE_COMMAND -f "$NZ_DASHBOARD_PATH/docker-compose.yaml" config >/dev/null 2>&1; then
-            NEZHA_IMAGES=$(sudo docker images --format "{{.Repository}}":"{{.Tag}}" | grep -w "nezha-dashboard")
+            NEZHA_IMAGES=$(sudo docker images --format "{{.Repository}}":"{{.Tag}}" | grep -w "nezhahq/nezha")
             if [ -n "$NEZHA_IMAGES" ]; then
-                echo "Docker image with nezha-dashboard repository exists:"
+                echo "Docker image with nezha repository exists:"
                 echo "$NEZHA_IMAGES"
                 IS_DOCKER_NEZHA=1
                 FRESH_INSTALL=0
                 return
             else
-                echo "No Docker images with the nezha-dashboard repository were found."
+                echo "No Docker images with the nezha repository were found."
             fi
         fi
     fi

diff --git a/nezha/template.pot b/nezha/template.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-02 13:39+0800\n"
+"POT-Creation-Date: 2024-12-03 13:42+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -35,11 +35,11 @@ msgid "Unknown architecture: $uname"
 msgstr ""
 
 #: nezha/template.sh:130 nezha/template.sh:144
-msgid "Docker image with nezha-dashboard repository exists:"
+msgid "Docker image with nezha repository exists:"
 msgstr ""
 
 #: nezha/template.sh:136 nezha/template.sh:150
-msgid "No Docker images with the nezha-dashboard repository were found."
+msgid "No Docker images with the nezha repository were found."
 msgstr ""
 
 #: nezha/template.sh:163
@@ -145,155 +145,155 @@ msgid ""
 "install/linux/"
 msgstr ""
 
-#: nezha/template.sh:334
+#: nezha/template.sh:333
 msgid "Please enter the site title: "
 msgstr ""
 
-#: nezha/template.sh:336
+#: nezha/template.sh:335
 msgid "Please enter the exposed port: (default 8008)"
 msgstr ""
 
-#: nezha/template.sh:338
+#: nezha/template.sh:337
 msgid ""
 "Please specify the preset nezha-agent host in install commands: (e.g. "
 "example.com:443)"
 msgstr ""
 
-#: nezha/template.sh:340
+#: nezha/template.sh:339
 msgid "Do you prefer to connect Agent via TLS? [y/N]"
 msgstr ""
 
-#: nezha/template.sh:355
+#: nezha/template.sh:352
 msgid "Please specify the backend locale"
 msgstr ""
 
-#: nezha/template.sh:360
+#: nezha/template.sh:357
 msgid "Please enter [1-3]: "
 msgstr ""
 
-#: nezha/template.sh:376
+#: nezha/template.sh:373
 msgid "Please enter the correct number [1-3]"
 msgstr ""
 
-#: nezha/template.sh:382
+#: nezha/template.sh:379
 msgid "All options cannot be empty"
 msgstr ""
 
-#: nezha/template.sh:408
+#: nezha/template.sh:405
 msgid "Downloading service file"
 msgstr ""
 
-#: nezha/template.sh:412 nezha/template.sh:418
+#: nezha/template.sh:409 nezha/template.sh:415
 msgid ""
 "File failed to get, please check if the network can link ${GITHUB_RAW_URL}"
 msgstr ""
 
-#: nezha/template.sh:426
+#: nezha/template.sh:423
 msgid ""
 "Dashboard configuration modified successfully, please wait for Dashboard "
 "self-restart to take effect"
 msgstr ""
 
-#: nezha/template.sh:436
+#: nezha/template.sh:433
 msgid "> Restart and Update"
 msgstr ""
 
-#: nezha/template.sh:445
+#: nezha/template.sh:442
 msgid "Nezha Monitoring Restart Successful"
 msgstr ""
 
-#: nezha/template.sh:446
+#: nezha/template.sh:443
 msgid "Default address: domain:site_access_port"
 msgstr ""
 
-#: nezha/template.sh:448
+#: nezha/template.sh:445
 msgid ""
 "The restart failed, probably because the boot time exceeded two seconds, "
 "please check the log information later"
 msgstr ""
 
-#: nezha/template.sh:475
+#: nezha/template.sh:472
 msgid ""
 "Fail to obtain Dashboard version, please check if the network can link "
 "https://api.github.com/repos/nezhahq/nezha/releases/latest"
 msgstr ""
 
-#: nezha/template.sh:478
+#: nezha/template.sh:475
 msgid "The current latest version is: ${_version}"
 msgstr ""
 
-#: nezha/template.sh:507
+#: nezha/template.sh:504
 msgid "> View Log"
 msgstr ""
 
-#: nezha/template.sh:533
+#: nezha/template.sh:530
 msgid "> Uninstall"
 msgstr ""
 
-#: nezha/template.sh:572
+#: nezha/template.sh:569
 msgid "Nezha Monitor Management Script Usage: "
 msgstr ""
 
-#: nezha/template.sh:574
+#: nezha/template.sh:571
 msgid "./nezha.sh                    - Show Menu"
 msgstr ""
 
-#: nezha/template.sh:575
+#: nezha/template.sh:572
 msgid "./nezha.sh install            - Install Dashboard"
 msgstr ""
 
-#: nezha/template.sh:576
+#: nezha/template.sh:573
 msgid "./nezha.sh modify_config      - Modify Dashboard Configuration"
 msgstr ""
 
-#: nezha/template.sh:577
+#: nezha/template.sh:574
 msgid "./nezha.sh restart_and_update - Restart and Update the Dashboard"
 msgstr ""
 
-#: nezha/template.sh:578
+#: nezha/template.sh:575
 msgid "./nezha.sh show_log           - View Dashboard Log"
 msgstr ""
 
-#: nezha/template.sh:579
+#: nezha/template.sh:576
 msgid "./nezha.sh uninstall          - Uninstall Dashboard"
 msgstr ""
 
-#: nezha/template.sh:584
+#: nezha/template.sh:581
 msgid "${green}Nezha Monitor Management Script${plain}"
 msgstr ""
 
-#: nezha/template.sh:586
+#: nezha/template.sh:583
 msgid "${green}1.${plain}  Install Dashboard"
 msgstr ""
 
-#: nezha/template.sh:587
+#: nezha/template.sh:584
 msgid "${green}2.${plain}  Modify Dashboard Configuration"
 msgstr ""
 
-#: nezha/template.sh:588
+#: nezha/template.sh:585
 msgid "${green}3.${plain}  Restart and Update Dashboard"
 msgstr ""
 
-#: nezha/template.sh:589
+#: nezha/template.sh:586
 msgid "${green}4.${plain}  View Dashboard Log"
 msgstr ""
 
-#: nezha/template.sh:590
+#: nezha/template.sh:587
 msgid "${green}5.${plain}  Uninstall Dashboard"
 msgstr ""
 
-#: nezha/template.sh:592
+#: nezha/template.sh:589
 msgid "${green}6.${plain}  Update Script"
 msgstr ""
 
-#: nezha/template.sh:594
+#: nezha/template.sh:591
 msgid "${green}0.${plain}  Exit Script"
 msgstr ""
 
-#: nezha/template.sh:596
+#: nezha/template.sh:593
 msgid "Please enter [0-6]: "
 msgstr ""
 
-#: nezha/template.sh:620
+#: nezha/template.sh:617
 msgid "Please enter the correct number [0-6]"
 msgstr ""
diff --git a/nezha/template.sh b/nezha/template.sh
@@ -125,29 +125,29 @@ installation_check() {
     if docker compose version >/dev/null 2>&1; then
         DOCKER_COMPOSE_COMMAND="docker compose"
         if sudo $DOCKER_COMPOSE_COMMAND ls | grep -qw "$NZ_DASHBOARD_PATH/docker-compose.yaml" >/dev/null 2>&1; then
-            NEZHA_IMAGES=$(sudo docker images --format "{{.Repository}}":"{{.Tag}}" | grep -w "nezha-dashboard")
+            NEZHA_IMAGES=$(sudo docker images --format "{{.Repository}}":"{{.Tag}}" | grep -w "nezhahq/nezha")
             if [ -n "$NEZHA_IMAGES" ]; then
-                echo _("Docker image with nezha-dashboard repository exists:")
+                echo _("Docker image with nezha repository exists:")
                 echo "$NEZHA_IMAGES"
                 IS_DOCKER_NEZHA=1
                 FRESH_INSTALL=0
                 return
             else
-                echo _("No Docker images with the nezha-dashboard repository were found.")
+                echo _("No Docker images with the nezha repository were found.")
             fi
         fi
     elif command -v docker-compose >/dev/null 2>&1; then
         DOCKER_COMPOSE_COMMAND="docker-compose"
         if sudo $DOCKER_COMPOSE_COMMAND -f "$NZ_DASHBOARD_PATH/docker-compose.yaml" config >/dev/null 2>&1; then
-            NEZHA_IMAGES=$(sudo docker images --format "{{.Repository}}":"{{.Tag}}" | grep -w "nezha-dashboard")
+            NEZHA_IMAGES=$(sudo docker images --format "{{.Repository}}":"{{.Tag}}" | grep -w "nezhahq/nezha")
             if [ -n "$NEZHA_IMAGES" ]; then
-                echo _("Docker image with nezha-dashboard repository exists:")
+                echo _("Docker image with nezha repository exists:")
                 echo "$NEZHA_IMAGES"
                 IS_DOCKER_NEZHA=1
                 FRESH_INSTALL=0
                 return
             else
-                echo _("No Docker images with the nezha-dashboard repository were found.")
+                echo _("No Docker images with the nezha repository were found.")
             fi
         fi
     fi

diff --git a/nezha/translations/en_US/LC_MESSAGES/nezha.mo b/nezha/translations/en_US/LC_MESSAGES/nezha.mo