From 1d7a73e02972cd5bb42c00f78af689702dfdf768 Mon Sep 17 00:00:00 2001
From: fscarmen <62703343+fscarmen@users.noreply.github.com>
Date: Thu, 16 Jun 2022 22:38:19 +0800
Subject: [PATCH] Update return.sh

---
 return.sh | 84 ++++++-------------------------------------------------
 1 file changed, 8 insertions(+), 76 deletions(-)

diff --git a/return.sh b/return.sh
index 7c2991e..f79e1b2 100644
--- a/return.sh
+++ b/return.sh
@@ -1,87 +1,19 @@
 #!/usr/bin/env bash
 TEMP_FILE='ip.temp'
-
 red(){ echo -e "\033[31m\033[01m$1\033[0m"; }
-yellow(){ echo -e "\033[33m\033[01m$1\033[0m"; }
 green(){ echo -e "\033[32m\033[01m$1\033[0m"; }
 reading(){ read -rp "$(green "$1")" "$2"; }
-translate(){ [[ -n "$1" ]] && curl -ksm8 "http://fanyi.youdao.com/translate?&doctype=json&type=AUTO&i=${1//[[:space:]]/}" | cut -d \" -f18 2>/dev/null; }
-
-check_dependencies(){ for c in $@; do
-type -p $c >/dev/null 2>&1 || (yellow " 安装 $c 中…… " && ${PACKAGE_INSTALL[b]} "$c") || (yellow " 先升级软件库才能继续安装 \$c，时间较长，请耐心等待…… " && ${PACKAGE_UPDATE[b]} && ${PACKAGE_INSTALL[b]} "$c")
-! type -p $c >/dev/null 2>&1 && yellow " 安装 \$c 失败，脚本中止，问题反馈:[https://github.com/fscarmen/tools/issues] " && exit 1; done; }
 
 ARCHITECTURE="$(arch)"
 case $ARCHITECTURE in
-x86_64 )  FILE=besttrace;;
-aarch64 ) FILE=besttracearm;;
-i386 )    FILE=besttracemac;;
-* ) red " 只支持 AMD64、ARM64、Mac 使用，问题反馈:[https://github.com/fscarmen/tools/issues] " && exit 1;;
+  x86_64 )  FILE=besttrace;;
+  aarch64 ) FILE=besttracearm;;
+  i386 )    FILE=besttracemac;;
+  * ) red " 只支持 AMD64、ARM64、Mac 使用，问题反馈:[https://github.com/fscarmen/tools/issues] " && exit 1;;
 esac
 
-# 多方式判断操作系统，试到有值为止。只支持 Debian 10/11、Ubuntu 18.04/20.04 或 CentOS 7/8 ,如非上述操作系统，退出脚本
-if [[ $ARCHITECTURE = i386 ]]; then
-  sw_vesrs 2>/dev/null | grep -qvi macos && red " 本脚本只支持 Debian、Ubuntu、CentOS、Alpine 或者 macOS 系统,问题反馈:[https://github.com/fscarmen/warp_unlock/issues] " && exit 1
-  b=0
-  SYSTEM='macOS'
-  PACKAGE_INSTALL=("brew install")
-  
-else
-  CMD=(	"$(grep -i pretty_name /etc/os-release 2>/dev/null | cut -d \" -f2)"
-      	"$(hostnamectl 2>/dev/null | grep -i system | cut -d : -f2)"
-	"$(lsb_release -sd 2>/dev/null)"
-	"$(grep -i description /etc/lsb-release 2>/dev/null | cut -d \" -f2)"
-	"$(grep . /etc/redhat-release 2>/dev/null)"
-	"$(grep . /etc/issue 2>/dev/null | cut -d \\ -f1 | sed '/^[ ]*$/d')"
-	)
-
-  REGEX=("debian" "ubuntu" "centos|red hat|kernel|oracle linux|amazon linux|alma|rocky")
-  RELEASE=("Debian" "Ubuntu" "CentOS")
-  PACKAGE_UPDATE=("apt -y update" "apt -y update" "yum -y update")
-  PACKAGE_INSTALL=("apt -y install" "apt -y install" "yum -y install")
-
-  for a in "${CMD[@]}"; do
-	  SYS="$a" && [[ -n $SYS ]] && break
-  done
-  
-  for ((b=0; b<${#REGEX[@]}; b++)); do
-	[[ $(echo "$SYS" | tr '[:upper:]' '[:lower:]') =~ ${REGEX[b]} ]] && SYSTEM="${RELEASE[b]}" && break
-  done
-fi
-
-[[ -z $SYSTEM ]] && red " 本脚本只支持 Debian、Ubuntu、CentOS、Alpine 或者 macOS 系统,问题反馈:[https://github.com/fscarmen/warp_unlock/issues] " && exit 1
-
-check_dependencies curl sudo
-ip=$1
-green "\n 本脚说明：测 VPS ——> 对端 经过的地区及线路，填本地IP就是测回程，核心程序来由: https://www.ipip.net/ ，请知悉！"
-[[ -z "$ip" || $ip = '[DESTINATION_IP]' ]] && reading "\n 请输入目的地 IP: " ip
-yellow "\n 检测中，请稍等片刻。\n"
-
-IP_4=$(curl -s4m5 https:/ip.gs/json) &&
-WAN_4=$(expr "$IP_4" : '.*ip\":\"\([^"]*\).*') &&
-COUNTRY_4E=$(expr "$IP_4" : '.*country\":\"\([^"]*\).*') &&
-COUNTRY_4=$(translate "$COUNTRY_4E") &&
-ASNORG_4=$(expr "$IP_4" : '.*asn_org\":\"\([^"]*\).*') &&
-PE_4=$(curl -sm5 ping.pe/$WAN_4) &&
-COOKIE_4=$(echo $PE_4 | sed "s/.*document.cookie=\"\([^;]\{1,\}\).*/\1/g") &&
-TYPE_4=$(curl -sm5 --header "cookie: $COOKIE_4" ping.pe/$WAN_4 | grep "id='page-div'" | sed "s/.*\[\(.*\)\].*/\1/g" | sed "s/.*orange'>\([^<]\{1,\}\).*/\1/g" | sed "s/hosting/数据中心/g;s/residential/家庭宽带/g") &&
-green " IPv4: $WAN_4\t\t 地区: $COUNTRY_4\t 类型: $TYPE_4\t ASN: $ASNORG_4\n"
-  
-IP_6=$(curl -s6m5 https:/ip.gs/json) &&
-WAN_6=$(expr "$IP_6" : '.*ip\":\"\([^"]*\).*') &&
-COUNTRY_6E=$(expr "$IP_6" : '.*country\":\"\([^"]*\).*') &&
-COUNTRY_6=$(translate "$COUNTRY_6E") &&
-ASNORG_6=$(expr "$IP_6" : '.*asn_org\":\"\([^"]*\).*') &&
-PE_6=$(curl -sm5 ping6.ping.pe/$WAN_6) &&
-COOKIE_6=$(echo $PE_6 | sed "s/.*document.cookie=\"\([^;]\{1,\}\).*/\1/g") &&
-TYPE_6=$(curl -sm5 --header "cookie: $COOKIE_6" ping6.ping.pe/$WAN_6 | grep "id='page-div'" | sed "s/.*\[\(.*\)\].*/\1/g" | sed "s/.*orange'>\([^<]\{1,\}\).*/\1/g" | sed "s/hosting/数据中心/g;s/residential/家庭宽带/g") &&
-green " IPv6: $WAN_6\t 地区: $COUNTRY_6\t 类型: $TYPE_6\t ASN: $ASNORG_6\n"
-
-[[ $ip =~ '.' && -z "$IP_4" ]] && red " VPS 没有 IPv4 网络，不能查 $ip\n" && exit 1
-[[ $ip =~ ':' && -z "$IP_6" ]] && red " VPS 没有 IPv6 网络，不能查 $ip\n" && exit 1
-
-[[ ! -e "$FILE" ]] && curl -sO https://cdn.jsdelivr.net/gh/fscarmen/tools/besttrace/$FILE
-chmod +x "$FILE" >/dev/null 2>&1
-sudo ./"$FILE" "$ip" -g cn > $TEMP_FILE
+[[ ! -e $FILE ]] && wget -q https://github.com/fscarmen/tools/raw/main/besttrace/$FILE >/dev/null 2>&1
+chmod 777 $FILE >/dev/null 2>&1
+sudo ./"$FILE" "$1" -g cn > $TEMP_FILE
 green "$(cat $TEMP_FILE | cut -d \* -f2 | sed "s/.*\(  AS[0-9]\)/\1/" | sed "/\*$/d;/^$/d;1d" | uniq | awk '{printf("%d.%s\n"),NR,$0}')"
-rm -f $TEMP_FILE $FILE
+rm -f $TEMP_FILE