From d790ca04d67bacf0756e151f599e76363706dd08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=96=E5=A5=B3=E5=AD=A9=E7=9A=84=E5=B0=8F=E7=81=AB?=
 =?UTF-8?q?=E6=9F=B4?= <44471469+Erope@users.noreply.github.com>
Date: Wed, 6 Dec 2023 21:35:24 +0800
Subject: [PATCH] Fix select_version (#306)

---
 README.md            |  2 +-
 script/install.sh    | 13 +++++++++++--
 script/install_en.sh | 13 +++++++++++--
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index fff95df..a0ada22 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
   <br>
   <small><i>LOGO designed by <a href="https://xio.ng" target="_blank">熊大</a> .</i></small>
   <br><br>
-<img alt="GitHub release (with filter)" src="https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&style=for-the-badge&logo=github&label=Dashboard">&nbsp;<img src="https://img.shields.io/github/v/release/nezhahq/agent?color=brightgreen&label=Agent&style=for-the-badge&logo=github">&nbsp;<img src="https://img.shields.io/github/actions/workflow/status/nezhahq/agent/agent.yml?label=Agent%20CI&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/badge/Installer-v0.15.2-brightgreen?style=for-the-badge&logo=linux">
+<img alt="GitHub release (with filter)" src="https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&style=for-the-badge&logo=github&label=Dashboard">&nbsp;<img src="https://img.shields.io/github/v/release/nezhahq/agent?color=brightgreen&label=Agent&style=for-the-badge&logo=github">&nbsp;<img src="https://img.shields.io/github/actions/workflow/status/nezhahq/agent/agent.yml?label=Agent%20CI&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/badge/Installer-v0.15.3-brightgreen?style=for-the-badge&logo=linux">
   <br>
   <br>
   <p>:trollface: <b>Nezha Monitoring: Self-hostable, lightweight, servers and websites monitoring and O&M tool.</b></p>
diff --git a/script/install.sh b/script/install.sh
index d216b04..d1cf8e9 100755
--- a/script/install.sh
+++ b/script/install.sh
@@ -14,7 +14,7 @@ NZ_AGENT_SERVICE="/etc/systemd/system/nezha-agent.service"
 NZ_AGENT_SERVICERC="/etc/init.d/nezha-agent"
 NZ_DASHBOARD_SERVICE="/etc/systemd/system/nezha-dashboard.service"
 NZ_DASHBOARD_SERVICERC="/etc/init.d/nezha-dashboard"
-NZ_VERSION="v0.15.2"
+NZ_VERSION="v0.15.3"
 
 red='\033[0;31m'
 green='\033[0;32m'
@@ -794,11 +794,20 @@ clean_all() {
 }
 
 select_version() {
+    DOCKER_COMPOSE_COMMAND=""
     if command -v docker compose >/dev/null 2>&1; then
-        if docker compose ls | grep -qw "$NZ_DASHBOARD_PATH/docker-compose.yaml" >/dev/null 2>&1; then
+        DOCKER_COMPOSE_COMMAND="docker compose"
+    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
         fi
     fi
+
     if [[ -f $NZ_DASHBOARD_PATH/app ]]; then
         IS_DOCKER_NEZHA=0
     else
diff --git a/script/install_en.sh b/script/install_en.sh
index 08a3c89..b675703 100755
--- a/script/install_en.sh
+++ b/script/install_en.sh
@@ -14,7 +14,7 @@ NZ_AGENT_SERVICE="/etc/systemd/system/nezha-agent.service"
 NZ_AGENT_SERVICERC="/etc/init.d/nezha-agent"
 NZ_DASHBOARD_SERVICE="/etc/systemd/system/nezha-dashboard.service"
 NZ_DASHBOARD_SERVICERC="/etc/init.d/nezha-dashboard"
-NZ_VERSION="v0.15.2"
+NZ_VERSION="v0.15.3"
 
 red='\033[0;31m'
 green='\033[0;32m'
@@ -792,11 +792,20 @@ clean_all() {
 }
 
 select_version() {
+    DOCKER_COMPOSE_COMMAND=""
     if command -v docker compose >/dev/null 2>&1; then
-        if docker compose ls | grep -qw "$NZ_DASHBOARD_PATH/docker-compose.yaml" >/dev/null 2>&1; then
+        DOCKER_COMPOSE_COMMAND="docker compose"
+    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
         fi
     fi
+
     if [[ -f $NZ_DASHBOARD_PATH/app ]]; then
         IS_DOCKER_NEZHA=0
     else