diff --git a/script/install.command b/script/install.command index 71ffbe9..803180c 100644 --- a/script/install.command +++ b/script/install.command @@ -65,15 +65,9 @@ pre_check() { if [[ -z "${CN}" ]]; then GITHUB_RAW_URL="raw.githubusercontent.com/naiba/nezha/master" GITHUB_URL="github.com" - Get_Docker_URL="get.docker.com" - Get_Docker_Argu=" " - Docker_IMG="ghcr.io\/naiba\/nezha-dashboard" else GITHUB_RAW_URL="gitee.com/naibahq/nezha/raw/master" - GITHUB_URL="github.com" - Get_Docker_URL="get.docker.com" - Get_Docker_Argu=" -s docker --mirror Aliyun" - Docker_IMG="registry.cn-shanghai.aliyuncs.com\/naibahq\/nezha-dashboard" + GITHUB_URL="gitee.com" fi fi } @@ -89,6 +83,9 @@ install_agent() { echo -e "Obtaining Agent version" local version=$(curl -m 10 -sL "https://api.github.com/repos/nezhahq/agent/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g') + if [ ! -n "$version" ]; then + version=$(curl -m 10 -sL "https://gitee.com/api/v5/repos/naibahq/agent/releases/latest" | awk -F '"' '{for(i=1;i<=NF;i++){if($i=="tag_name"){print $(i+2)}}}') + fi if [ ! -n "$version" ]; then version=$(curl -m 10 -sL "https://fastly.jsdelivr.net/gh/nezhahq/agent/" | grep "option\.value" | awk -F "'" '{print $2}' | sed 's/nezhahq\/agent@/v/g') fi @@ -108,7 +105,12 @@ install_agent() { chmod -R 777 $NZ_AGENT_PATH echo -e "Downloading Agent" - curl -o nezha-agent_darwin_${os_arch}.zip -L -f --retry 2 --retry-max-time 60 https://${GITHUB_URL}/nezhahq/agent/releases/download/${version}/nezha-agent_darwin_${os_arch}.zip >/dev/null 2>&1 + if [[ -z $CN ]]; then + NZ_AGENT_URL="https://${GITHUB_URL}/nezhahq/agent/releases/download/${version}/nezha-agent_darwin_${os_arch}.zip" + else + NZ_AGENT_URL="https://${GITHUB_URL}/naibahq/agent/releases/download/${version}/nezha-agent_darwin_${os_arch}.zip" + fi + curl -o nezha-agent_darwin_${os_arch}.zip -L -f --retry 2 --retry-max-time 60 $NZ_AGENT_URL >/dev/null 2>&1 if [[ $? != 0 ]]; then echo -e "${red}Fail to download agent, please check if the network can link ${GITHUB_URL}${plain}" return 0 diff --git a/script/install.ps1 b/script/install.ps1 index 414a30c..5a9ed99 100644 --- a/script/install.ps1 +++ b/script/install.ps1 @@ -56,7 +56,7 @@ if($region -ne "CN"){ $download = "https://github.com/$agentrepo/releases/download/$agenttag/$file" Write-Host "Location:$region,connect directly!" -BackgroundColor DarkRed -ForegroundColor Green }else{ -$download = "https://github.com/$agentrepo/releases/download/$agenttag/$file" +$download = "https://gitee.com/naibahq/agent/releases/download/$agenttag/$file" Write-Host "Location:CN,use mirror address" -BackgroundColor DarkRed -ForegroundColor Green } echo $download diff --git a/script/install.sh b/script/install.sh index 8f98d80..31e129b 100755 --- a/script/install.sh +++ b/script/install.sh @@ -12,7 +12,7 @@ NZ_DASHBOARD_PATH="${NZ_BASE_PATH}/dashboard" NZ_AGENT_PATH="${NZ_BASE_PATH}/agent" NZ_DASHBOARD_SERVICE="/etc/systemd/system/nezha-dashboard.service" NZ_DASHBOARD_SERVICERC="/etc/init.d/nezha-dashboard" -NZ_VERSION="v0.17.0" +NZ_VERSION="v0.17.1" red='\033[0;31m' green='\033[0;32m' @@ -114,7 +114,7 @@ pre_check() { Docker_IMG="ghcr.io\/naiba\/nezha-dashboard" else GITHUB_RAW_URL="gitee.com/naibahq/nezha/raw/master" - GITHUB_URL="github.com" + 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" @@ -339,6 +339,9 @@ install_agent() { echo "正在获取监控Agent版本号" local version=$(curl -m 10 -sL "https://api.github.com/repos/nezhahq/agent/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g') + if [ ! -n "$version" ]; then + version=$(curl -m 10 -sL "https://gitee.com/api/v5/repos/naibahq/agent/releases/latest" | awk -F '"' '{for(i=1;i<=NF;i++){if($i=="tag_name"){print $(i+2)}}}') + fi if [ ! -n "$version" ]; then version=$(curl -m 10 -sL "https://fastly.jsdelivr.net/gh/nezhahq/agent/" | grep "option\.value" | awk -F "'" '{print $2}' | sed 's/nezhahq\/agent@/v/g') fi @@ -358,7 +361,12 @@ install_agent() { sudo chmod -R 700 $NZ_AGENT_PATH echo "正在下载监控端" - wget -t 2 -T 60 -O nezha-agent_linux_${os_arch}.zip https://${GITHUB_URL}/nezhahq/agent/releases/download/${version}/nezha-agent_linux_${os_arch}.zip >/dev/null 2>&1 + if [ -z "$CN" ]; then + NZ_AGENT_URL="https://${GITHUB_URL}/nezhahq/agent/releases/download/${version}/nezha-agent_linux_${os_arch}.zip" + else + NZ_AGENT_URL="https://${GITHUB_URL}/naibahq/agent/releases/download/${version}/nezha-agent_linux_${os_arch}.zip" + fi + wget -t 2 -T 60 -O nezha-agent_linux_${os_arch}.zip $NZ_AGENT_URL >/dev/null 2>&1 if [ $? != 0 ]; then err "Release 下载失败,请检查本机能否连接 ${GITHUB_URL}" return 1 diff --git a/script/install_en.sh b/script/install_en.sh index 9f6c8b0..f2e7958 100755 --- a/script/install_en.sh +++ b/script/install_en.sh @@ -12,7 +12,7 @@ NZ_DASHBOARD_PATH="${NZ_BASE_PATH}/dashboard" NZ_AGENT_PATH="${NZ_BASE_PATH}/agent" NZ_DASHBOARD_SERVICE="/etc/systemd/system/nezha-dashboard.service" NZ_DASHBOARD_SERVICERC="/etc/init.d/nezha-dashboard" -NZ_VERSION="v0.17.0" +NZ_VERSION="v0.17.1" red='\033[0;31m' green='\033[0;32m' @@ -113,7 +113,7 @@ pre_check() { Docker_IMG="ghcr.io\/naiba\/nezha-dashboard" else GITHUB_RAW_URL="gitee.com/naibahq/nezha/raw/master" - GITHUB_URL="github.com" + 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" @@ -335,9 +335,12 @@ install_agent() { echo "> Install Agent" - echo "Obtaining Agent version" + echo "Obtaining Agent version number" local version=$(curl -m 10 -sL "https://api.github.com/repos/nezhahq/agent/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g') + if [ ! -n "$version" ]; then + version=$(curl -m 10 -sL "https://gitee.com/api/v5/repos/naibahq/agent/releases/latest" | awk -F '"' '{for(i=1;i<=NF;i++){if($i=="tag_name"){print $(i+2)}}}') + fi if [ ! -n "$version" ]; then version=$(curl -m 10 -sL "https://fastly.jsdelivr.net/gh/nezhahq/agent/" | grep "option\.value" | awk -F "'" '{print $2}' | sed 's/nezhahq\/agent@/v/g') fi