diff --git a/README.md b/README.md index c973042..c9e6c7a 100644 --- a/README.md +++ b/README.md @@ -22,21 +22,15 @@ **推荐配置:** 安装前准备 _两个域名_,一个可以 **接入 CDN** 作为 _公开访问_,比如 (status.nai.ba);另外一个解析到面板服务器作为 Agent 连接 Dashboard 使用,**不能接入 CDN** 直接暴露面板主机 IP,比如(randomdashboard.nai.ba)。 ```shell -curl -sSL https://raw.githubusercontent.com/naiba/nezha/master/script/fetch.sh | bash -sudo /opt/nezha/nezha.sh +curl -L https://raw.githubusercontent.com/naiba/nezha/master/script/install.sh -o nezha.sh && chmod +x nezha.sh +sudo ./nezha.sh ``` 国内镜像加速: ```shell -curl -sSL https://cdn.jsdelivr.net/gh/naiba/nezha@master/script/fetch.sh | CN=true bash -CN=true sudo /opt/nezha/nezha.sh -``` - -再次运行仅需: - -``` -/opt/nezha/nezha.sh +curl -L https://cdn.jsdelivr.net/gh/naiba/nezha@master/script/install.sh -o nezha.sh && chmod +x nezha.sh +CN=true sudo ./nezha.sh ``` _\* 使用 WatchTower 可以自动更新面板,Windows 终端可以使用 nssm 配置自启动(见尾部教程)_ diff --git a/script/fetch.sh b/script/fetch.sh deleted file mode 100644 index ca2f5df..0000000 --- a/script/fetch.sh +++ /dev/null @@ -1,9 +0,0 @@ -if [[ -z "${CN}" ]]; then - GITHUB_RAW_URL="raw.githubusercontent.com/naiba/nezha/master" -else - GITHUB_RAW_URL="cdn.jsdelivr.net/gh/naiba/nezha@master" -fi -mkdir -p /opt/nezha -chmod 777 /opt/nezha -curl -sSL https://${GITHUB_RAW_URL}/script/install.sh -o /opt/nezha/nezha.sh -chmod +x /opt/nezha/nezha.sh \ No newline at end of file diff --git a/script/install.sh b/script/install.sh index e0c1b9c..789ce9c 100755 --- a/script/install.sh +++ b/script/install.sh @@ -93,25 +93,22 @@ confirm() { fi } -update_script () { +update_script() { echo -e "> 更新脚本" - mkdir -p $NZ_BASE_PATH - chmod 777 -R $NZ_BASE_PATH curl -sL https://${GITHUB_RAW_URL}/script/install.sh -o /tmp/nezha.sh new_version=$(cat /tmp/nezha.sh | grep "NZ_VERSION" | head -n 1 | awk -F "=" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g') - if [ ! -n "$new_version" ]; then + if [ ! -n "$new_version" ]; then echo -e "脚本获取失败,请检查本机能否链接 https://${GITHUB_RAW_URL}/script/install.sh" return 1 fi echo -e "当前最新版本为: ${new_version}" - mv -f /tmp/nezha.sh ${NZ_BASE_PATH}/nezha.sh && chmod a+x ${NZ_BASE_PATH}/nezha.sh - - echo -e "脚本获取成功,脚本固定位置为${NZ_BASE_PATH}/nezha.sh,请今后使用 ${NZ_BASE_PATH}/nezha.sh 运行脚本" - echo -e "10s后执行新脚本" - sleep 10s + mv -f /tmp/nezha.sh ./nezha.sh && chmod a+x ./nezha.sh + + echo -e "3s后执行新脚本" + sleep 3s clear - exec ${NZ_BASE_PATH}/nezha.sh + exec ./nezha.sh exit 0 } @@ -182,7 +179,7 @@ install_agent() { local version=$(curl -sL "https://api.github.com/repos/naiba/nezha/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g') - if [ ! -n "$version" ]; then + if [ ! -n "$version" ]; then echo -e "获取版本号失败,请检查本机能否链接 https://api.github.com/repos/naiba/nezha/releases/latest" else echo -e "当前最新版本为: ${version}"