smeb_y/nodeloc_vps_test
1
0
Fork 0
mirror of https://github.com/everett7623/nodeloc_vps_test.git synced 2024-12-29 09:45:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update Nlbench_beta.sh

Browse Source
This commit is contained in:
Jensfrank 2024-07-05 13:32:20 +08:00 committed by GitHub
parent 3c2a4d48fa
commit f627ab5324
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Nlbench_beta.sh
View File

@ -54,13 +54,7 @@ install_dependencies() {
# 获取IP地址和ISP信息 # 获取IP地址和ISP信息
ip_address_and_isp() { ip_address_and_isp() {
ipv4_address=$(curl -s --max-time 5 ipv4.ip.sb) ipv4_address=$(curl -s --max-time 5 ipv4.ip.sb)
if [ -z "$ipv4_address" ]; then
ipv4_address=$(ip -4 addr show | grep -oP '(?<=inet\s)\d+(\.\d+){3}' | grep -v '127.0.0.1' | head -n1)
fi
ipv6_address=$(curl -s --max-time 5 ipv6.ip.sb) ipv6_address=$(curl -s --max-time 5 ipv6.ip.sb)
if [ -z "$ipv6_address" ]; then
ipv6_address=$(ip -6 addr show | grep -oP '(?<=inet6\s)[\da-f:]+' | grep -v '^::1' | grep -v '^fe80' | head -n1)
fi
# 获取ISP信息 # 获取ISP信息
isp_info=$(curl -s https://ipapi.co/json/) isp_info=$(curl -s https://ipapi.co/json/)
@ -78,6 +72,11 @@ ip_address_and_isp() {
if [ "$is_warp" = true ] || [ -z "$ipv4_address" ]; then if [ "$is_warp" = true ] || [ -z "$ipv4_address" ]; then
use_ipv6=true use_ipv6=true
fi fi
echo "IPv4: $ipv4_address"
echo "IPv6: $ipv6_address"
echo "Is WARP: $is_warp"
echo "Use IPv6: $use_ipv6"
} }
# 检测VPS地理位置 # 检测VPS地理位置
@ -155,6 +154,8 @@ run_script() {
local script_number=$1 local script_number=$1
local output_file=$2 local output_file=$2
local temp_file=$(mktemp) local temp_file=$(mktemp)
# 调用ip_address_and_isp函数获取IP地址和ISP信息
ip_address_and_isp
case $script_number in case $script_number in
# YABS # YABS
1) 1)