From ba879335805f33966a5f4b0603ab4ed8203267a2 Mon Sep 17 00:00:00 2001 From: YekongTAT Date: Sun, 8 Jan 2023 19:32:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A1=A5=E5=85=85=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=9E=B6=E6=9E=84=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nt_install.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nt_install.sh b/nt_install.sh index ef5fe1f..16331f0 100644 --- a/nt_install.sh +++ b/nt_install.sh @@ -17,10 +17,14 @@ checkSystemArch() { arch=$(uname -m) if [[ $arch == "x86_64" ]]; then archParam="amd64" - fi - - if [[ $arch == "aarch64" ]]; then + elif [[ $arch == "i386" ]]; then + archParam="386" + elif [[ $arch == "aarch64" ]]; then archParam="arm64" + elif [[ $arch == "armv7l" ]] || [[ $arch == "armv7ml" ]]; then + archParam="armv7" + elif [[ $arch == "mips" ]]; then + archParam="mips" fi } From b435a36ee432a39415ffb7b2fcdada6faa213767 Mon Sep 17 00:00:00 2001 From: YekongTAT Date: Sun, 8 Jan 2023 20:56:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?downPath=20=E5=A2=9E=E5=8A=A0=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 部分奇怪的系统可能没有 `/usr/local` 目录,如果目录不存在就把 `nexttrace` 放到 `/usr/local` --- nt_install.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nt_install.sh b/nt_install.sh index 16331f0..6f8b9cb 100644 --- a/nt_install.sh +++ b/nt_install.sh @@ -32,7 +32,14 @@ checkSystemDistribution() { case "$OSTYPE" in linux*) osDistribution="linux" + + if [ ! -d "/usr/local" ]; + then + downPath="/usr/bin/nexttrace" + else downPath="/usr/local/bin/nexttrace" + fi + ;; *) echo "unknown: $OSTYPE" @@ -113,7 +120,7 @@ changeMode() { runBinrayFileHelp() { if [ -e ${downPath} ]; then ${downPath} -V - echo -e "${Tips} 一切准备就绪!使用命令 nexttrace 1.1.1.1 开始您的第一次路由测试吧~ 更多进阶命令玩法可以用 nexttrace -h 查看哦\n 关于软件卸载,因为nexttrace是绿色版单文件,卸载只需输入命令 rm /usr/local/bin/nexttrace 即可" + echo -e "${Tips} 一切准备就绪!使用命令 nexttrace 1.1.1.1 开始您的第一次路由测试吧~ 更多进阶命令玩法可以用 nexttrace -h 查看哦\n 关于软件卸载,因为nexttrace是绿色版单文件,卸载只需输入命令 rm ${downPath} 即可" fi }