From e61e10de579bcef7ec9bd1b94a38adcd427020ca 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: Sun, 1 Dec 2024 21:28:08 +0800 Subject: [PATCH] Feature/v0 fix (#22) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 固定 dashboard 版本为 v0.20.13 * Use v0.20.13 for dashboard & add warning in menu --- install.sh | 13 +++++++------ install_en.sh | 13 +++++++------ locale.json | 6 ++++-- template.sh | 11 ++++++----- 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/install.sh b/install.sh index 2c33edf..e28b8bb 100644 --- a/install.sh +++ b/install.sh @@ -122,20 +122,20 @@ pre_check() { GITHUB_URL=$CUSTOM_MIRROR Get_Docker_URL="get.docker.com" Get_Docker_Argu=" -s docker --mirror Aliyun" - Docker_IMG="registry.cn-shanghai.aliyuncs.com\/naibahq\/nezha-dashboard:v0-final" + Docker_IMG="registry.cn-shanghai.aliyuncs.com\/naibahq\/nezha-dashboard:v0.20.13" else if [ -z "$CN" ]; then GITHUB_RAW_URL="raw.githubusercontent.com/nezhahq/scripts/v0" GITHUB_URL="github.com" Get_Docker_URL="get.docker.com" Get_Docker_Argu=" " - Docker_IMG="ghcr.io\/naibahq\/nezha:v0-final" + Docker_IMG="ghcr.io\/naiba\/nezha-dashboard:v0.20.13" else GITHUB_RAW_URL="gitee.com/naibahq/scripts/raw/v0" GITHUB_URL="gitee.com" Get_Docker_URL="get.docker.com" Get_Docker_Argu=" -s docker --mirror Aliyun" - Docker_IMG="registry.cn-shanghai.aliyuncs.com\/naibahq\/nezha-dashboard:v0-final" + Docker_IMG="registry.cn-shanghai.aliyuncs.com\/naibahq\/nezha-dashboard:v0.20.13" fi fi } @@ -579,10 +579,10 @@ restart_and_update_docker() { update_docker_compose_image() { yaml_file_path="${NZ_DASHBOARD_PATH}/docker-compose.yaml" if grep -q "registry.cn-shanghai.aliyuncs.com/naibahq/nezha-dashboard$" "$yaml_file_path"; then - sed -i 's|registry.cn-shanghai.aliyuncs.com/naibahq/nezha-dashboard$|registry.cn-shanghai.aliyuncs.com/naibahq/nezha-dashboard:v0-final|' "$yaml_file_path" + sed -i 's|registry.cn-shanghai.aliyuncs.com/naibahq/nezha-dashboard$|registry.cn-shanghai.aliyuncs.com/naibahq/nezha-dashboard:v0.20.13|' "$yaml_file_path" fi if grep -q "ghcr.io/naiba/nezha-dashboard$" "$yaml_file_path"; then - sed -i 's|ghcr.io/naiba/nezha-dashboard$|ghcr.io/naibahq/nezha:v0-final|' "$yaml_file_path" + sed -i 's|ghcr.io/naiba/nezha-dashboard$|ghcr.io/naibahq/nezha-dashboard:v0.20.13|' "$yaml_file_path" fi } @@ -829,8 +829,9 @@ show_usage() { show_menu() { printf " - ${green}哪吒监控管理脚本${plain} + ${green}哪吒监控管理脚本 For v0${plain} --- https://github.com/naiba/nezha --- + ${red}v0面板已停止维护，请及时升级至v1，详见https://nezha.wiki/${plain} ${green}1.${plain} 安装面板端 ${green}2.${plain} 修改面板配置 ${green}3.${plain} 启动面板 diff --git a/install_en.sh b/install_en.sh index 7679285..67efd71 100644 --- a/install_en.sh +++ b/install_en.sh @@ -122,20 +122,20 @@ pre_check() { GITHUB_URL=$CUSTOM_MIRROR Get_Docker_URL="get.docker.com" Get_Docker_Argu=" -s docker --mirror Aliyun" - Docker_IMG="registry.cn-shanghai.aliyuncs.com\/naibahq\/nezha-dashboard:v0-final" + Docker_IMG="registry.cn-shanghai.aliyuncs.com\/naibahq\/nezha-dashboard:v0.20.13" else if [ -z "$CN" ]; then GITHUB_RAW_URL="raw.githubusercontent.com/nezhahq/scripts/v0" GITHUB_URL="github.com" Get_Docker_URL="get.docker.com" Get_Docker_Argu=" " - Docker_IMG="ghcr.io\/naibahq\/nezha:v0-final" + Docker_IMG="ghcr.io\/naiba\/nezha-dashboard:v0.20.13" else GITHUB_RAW_URL="gitee.com/naibahq/scripts/raw/v0" GITHUB_URL="gitee.com" Get_Docker_URL="get.docker.com" Get_Docker_Argu=" -s docker --mirror Aliyun" - Docker_IMG="registry.cn-shanghai.aliyuncs.com\/naibahq\/nezha-dashboard:v0-final" + Docker_IMG="registry.cn-shanghai.aliyuncs.com\/naibahq\/nezha-dashboard:v0.20.13" fi fi } @@ -579,10 +579,10 @@ restart_and_update_docker() { update_docker_compose_image() { yaml_file_path="${NZ_DASHBOARD_PATH}/docker-compose.yaml" if grep -q "registry.cn-shanghai.aliyuncs.com/naibahq/nezha-dashboard$" "$yaml_file_path"; then - sed -i 's|registry.cn-shanghai.aliyuncs.com/naibahq/nezha-dashboard$|registry.cn-shanghai.aliyuncs.com/naibahq/nezha-dashboard:v0-final|' "$yaml_file_path" + sed -i 's|registry.cn-shanghai.aliyuncs.com/naibahq/nezha-dashboard$|registry.cn-shanghai.aliyuncs.com/naibahq/nezha-dashboard:v0.20.13|' "$yaml_file_path" fi if grep -q "ghcr.io/naiba/nezha-dashboard$" "$yaml_file_path"; then - sed -i 's|ghcr.io/naiba/nezha-dashboard$|ghcr.io/naibahq/nezha:v0-final|' "$yaml_file_path" + sed -i 's|ghcr.io/naiba/nezha-dashboard$|ghcr.io/naibahq/nezha-dashboard:v0.20.13|' "$yaml_file_path" fi } @@ -829,8 +829,9 @@ show_usage() { show_menu() { printf " - ${green}Nezha Monitor Management Script${plain} + ${green}Nezha Monitor Management Script For v0${plain} --- https://github.com/naiba/nezha --- + ${red}v0 panel has stopped maintenance, please upgrade to v1 as soon as possible, see https://nezha.wiki/${plain} ${green}1.${plain} Install Dashboard ${green}2.${plain} Modify Dashbaord Configuration ${green}3.${plain} Start Dashboard diff --git a/locale.json b/locale.json index b9fb065..6f795ad 100644 --- a/locale.json +++ b/locale.json @@ -85,7 +85,8 @@ "Usage13": "./nezha.sh uninstall_agent - 卸载Agent", "Usage14": "./nezha.sh restart_agent - 重启Agent", "Usage15": "./nezha.sh update_script - 更新脚本", - "MenuInfo": "哪吒监控管理脚本", + "MenuInfo": "哪吒监控管理脚本 For v0", + "UpdateWarning": "v0面板已停止维护，请及时升级至v1，详见https://nezha.wiki/", "Menu0": "退出脚本", "Menu1": "安装面板端", "Menu2": "修改面板配置", @@ -193,7 +194,8 @@ "Usage13": "./nezha.sh uninstall_agent - Uninstall Agent", "Usage14": "./nezha.sh restart_agent - Restart Agent", "Usage15": "./nezha.sh update_script - Update Script", - "MenuInfo": "Nezha Monitor Management Script", + "MenuInfo": "Nezha Monitor Management Script For v0", + "UpdateWarning": "v0 panel has stopped maintenance, please upgrade to v1 as soon as possible, see https://nezha.wiki/", "Menu0": "Exit Script", "Menu1": "Install Dashboard", "Menu2": "Modify Dashbaord Configuration", diff --git a/template.sh b/template.sh index bc97056..7a0dbe3 100644 --- a/template.sh +++ b/template.sh @@ -122,20 +122,20 @@ pre_check() { GITHUB_URL=$CUSTOM_MIRROR Get_Docker_URL="get.docker.com" Get_Docker_Argu=" -s docker --mirror Aliyun" - Docker_IMG="registry.cn-shanghai.aliyuncs.com\/naibahq\/nezha-dashboard:v0-final" + Docker_IMG="registry.cn-shanghai.aliyuncs.com\/naibahq\/nezha-dashboard:v0.20.13" else if [ -z "$CN" ]; then GITHUB_RAW_URL="raw.githubusercontent.com/nezhahq/scripts/v0" GITHUB_URL="github.com" Get_Docker_URL="get.docker.com" Get_Docker_Argu=" " - Docker_IMG="ghcr.io\/naibahq\/nezha:v0-final" + Docker_IMG="ghcr.io\/naiba\/nezha-dashboard:v0.20.13" else GITHUB_RAW_URL="gitee.com/naibahq/scripts/raw/v0" GITHUB_URL="gitee.com" Get_Docker_URL="get.docker.com" Get_Docker_Argu=" -s docker --mirror Aliyun" - Docker_IMG="registry.cn-shanghai.aliyuncs.com\/naibahq\/nezha-dashboard:v0-final" + Docker_IMG="registry.cn-shanghai.aliyuncs.com\/naibahq\/nezha-dashboard:v0.20.13" fi fi } @@ -579,10 +579,10 @@ restart_and_update_docker() { update_docker_compose_image() { yaml_file_path="${NZ_DASHBOARD_PATH}/docker-compose.yaml" if grep -q "registry.cn-shanghai.aliyuncs.com/naibahq/nezha-dashboard$" "$yaml_file_path"; then - sed -i 's|registry.cn-shanghai.aliyuncs.com/naibahq/nezha-dashboard$|registry.cn-shanghai.aliyuncs.com/naibahq/nezha-dashboard:v0-final|' "$yaml_file_path" + sed -i 's|registry.cn-shanghai.aliyuncs.com/naibahq/nezha-dashboard$|registry.cn-shanghai.aliyuncs.com/naibahq/nezha-dashboard:v0.20.13|' "$yaml_file_path" fi if grep -q "ghcr.io/naiba/nezha-dashboard$" "$yaml_file_path"; then - sed -i 's|ghcr.io/naiba/nezha-dashboard$|ghcr.io/naibahq/nezha:v0-final|' "$yaml_file_path" + sed -i 's|ghcr.io/naiba/nezha-dashboard$|ghcr.io/naibahq/nezha-dashboard:v0.20.13|' "$yaml_file_path" fi } @@ -831,6 +831,7 @@ show_menu() { printf " ${green}{{.MenuInfo}}${plain} --- https://github.com/naiba/nezha --- + ${red}{{.UpdateWarning}}${plain} ${green}1.${plain} {{.Menu1}} ${green}2.${plain} {{.Menu2}} ${green}3.${plain} {{.Menu3}}