From 6179f1b8f049cb031bbacf2dcb702f3226b60b3f Mon Sep 17 00:00:00 2001 From: tsosunchia <59512455+tsosunchia@users.noreply.github.com> Date: Sat, 26 Aug 2023 15:13:58 +0800 Subject: [PATCH] Update README --- README.md | 38 ++++++++++++++++++----------- README_zh_CN.md | 40 ++++++++++++++++++++----------- nt_install.sh => nt_install_v1.sh | 9 +------ 3 files changed, 51 insertions(+), 36 deletions(-) rename nt_install.sh => nt_install_v1.sh (88%) diff --git a/README.md b/README.md index 71e83ea..cdb2c4c 100644 --- a/README.md +++ b/README.md @@ -22,15 +22,31 @@

+## IAAS Sponsor + +
+ + + +      + + + +      + + + +
+ +We are extremely grateful to [DMIT](https://dmit.io) and [Misaka](https://misaka.io) and [Skywolf](https://skywolf.cloud) for providing the network infrastructure that powers this project. + ## How To Use Document Language: English | [简体中文](README_zh_CN.md) -⚠️ This is the README for the V1 version of NextTrace. For the refactored version, please turn to [nxtrace/Ntrace-core](https://github.com/nxtrace/Ntrace-core). -
For this V1 version of NextTrace, there will be no more feature updates (bug fixes for existing features will continue), and future efforts will be shifted to refactored version. -
If you do not require the feature updates included in version v1.1.3 and subsequent versions, we recommend that you continue to use version v1.1.2. +⚠️ This is the README for the V1 version of NextTrace. -Differences between version v1.1.2 and v1.1.7-2: +Differences between version v1.1.2 and v1.1.9: * Added and fixed support for some third-party GEOIP APIs * ipinfo * ipinfoLocal, which is the offline version of the ipinfo database @@ -53,16 +69,10 @@ Differences between version v1.1.2 and v1.1.7-2: * Linux * One-click installation script - * Download from GitHub - ```shell - bash -c "$(curl -Ls https://github.com/nxtrace/Ntrace-V1/raw/main/nt_install.sh)" - ``` - * GHPROXY mirror (For use in Mainland China) - - ```shell - bash -c "$(curl -Ls https://ghproxy.com/https://github.com/nxtrace/Ntrace-V1/raw/main/nt_install.sh)" - ``` + ```shell + bash -c "$(curl http://nexttrace-io-leomoe-api-a0.shop/nt_install_v1.sh)" + ``` * Arch Linux AUR installation command * Build from source @@ -436,7 +446,7 @@ For feedback related to corrections about IP information, we currently have two >- This project's dedicated correction email: `correction@moeqing.com` (Please note that this email is only for correcting IP-related information. For other feedback, please submit an ISSUE) How to obtain the freshly baked binary executable of the latest commit? -> Please go to the most recent [Build & Release](https://github.com/sjlleo/nexttrace/actions/workflows/build.yml) workflow in GitHub Actions. +> Please go to the most recent [Build & Release](https://github.com/nxtrace/Ntrace-V1/actions/workflows/build.yml) workflow in GitHub Actions. ## Star History diff --git a/README_zh_CN.md b/README_zh_CN.md index 21ab7df..c8f85c0 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -23,16 +23,33 @@

+## IAAS Sponsor + +
+ + + +      + + + +      + + + +
+ + + +我们非常感谢 [DMIT](https://dmit.io) 和 [Misaka](https://misaka.io) 和 [Skywolf](https://skywolf.cloud) 提供了支持本项目所需的网络基础设施。 ## How To Use Document Language: [English](README.md) | 简体中文 -⚠️ 这是NextTrace V1 版本的README文件。对于重构版本，请参阅 [nxtrace/Ntrace-core](https://github.com/nxtrace/Ntrace-core)。 -
对于此V1版本的NextTrace我们将不再有功能性更新(已有功能BUG修复继续进行)，未来的工作重心将转移到重构版本。 -
如果您不需要 v1.1.3及其后续版本包含的功能更新，我们建议您继续使用 v1.1.2 版本。 +⚠️ 这是NextTrace V1 版本的README文件。 -关于 v1.1.2 与 v1.1.7-2 版本的区别: +关于 v1.1.2 与 v1.1.9 版本的区别: * 增加和修复了部分第三方GEOIP API的支持 * ipinfo * ipinfoLocal 即ipinfo数据库离线版 @@ -63,16 +80,11 @@ NextTrace 的频道由项目成员负责，会传递一部分通知，也会发 * Linux * 一键安装脚本 - * Github下载 - ```shell - bash -c "$(curl -Ls https://github.com/sjlleo/nexttrace/raw/main/nt_install.sh)" - ``` - * GHPROXY镜像（中国大陆使用） - - ```shell - bash -c "$(curl -Ls https://ghproxy.com/https://github.com/sjlleo/nexttrace/raw/main/nt_install.sh)" - ``` + ```shell + bash -c "$(curl http://nexttrace-io-leomoe-api-a0.shop/nt_install_v1.sh)" + ``` + * Arch Linux AUR 安装命令 * 由源码构建 @@ -416,7 +428,7 @@ NextTrace `LeoMoeAPI`现已使用Proof of Work(POW)机制来防止滥用，其 其他第三方 API 尽管集成在本项目内，但是具体的 TOS 以及 AUP，请详见第三方 API 官网。如遇到 IP 数据错误，也请直接联系他们纠错。 如何获取最新commit的新鲜出炉的二进制可执行文件？ ->请前往GitHub Actions中最新一次 [Build & Release](https://github.com/sjlleo/nexttrace/actions/workflows/build.yml) workflow. +>请前往GitHub Actions中最新一次 [Build & Release](https://github.com/nxtrace/Ntrace-V1/actions/workflows/build.yml) workflow. ## IP 数据以及精准度说明 diff --git a/nt_install.sh b/nt_install_v1.sh similarity index 88% rename from nt_install.sh rename to nt_install_v1.sh index 9162813..e783977 100644 --- a/nt_install.sh +++ b/nt_install_v1.sh @@ -93,12 +93,7 @@ checkWgetPackage() { downloadBinrayFile() { echo -e "${Info} 获取最新版的 NextTrace 发行版文件信息" # 简单说明一下，Github提供了一个API，可以获取最新发行版本的二进制文件下载地址（对应的是browser_download_url），根据刚刚测得的osDistribution、archParam，获取对应的下载地址 - latestURL=$(curl -sL https://api.github.com/repos/nxtrace/Ntrace-V1/releases/latest | grep -i "browser_download_url.*${osDistribution}.*${archParam}" | awk -F '"' '{print $4}') - - if [ "$countryCode" == "CN" ]; then - echo -e "${Info} 检测到国内环境，正在使用镜像下载" - latestURL="https://ghproxy.com/"$latestURL - fi + latestURL=$(curl -sL http://nexttrace-io-leomoe-api-a0.shop/v119.json | grep -i "browser_download_url.*${osDistribution}.*${archParam}" | awk -F '"' '{print $4}') echo -e "${Info} 正在下载 NextTrace 二进制文件..." wget -O ${Temp_path} ${latestURL} &> /dev/null @@ -130,8 +125,6 @@ checkSystemDistribution checkSystemArch checkWgetPackage -# Download Procedure -getLocation downloadBinrayFile # Run Procedure