From 02f2ee7a00617fe820fed8bb9e1192eac8257855 Mon Sep 17 00:00:00 2001
From: fscarmen <62703343+fscarmen@users.noreply.github.com>
Date: Thu, 21 Apr 2022 11:07:22 +0800
Subject: [PATCH] Update t.sh

---
 old/t.sh | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/old/t.sh b/old/t.sh
index bbe7f39..c792d6f 100644
--- a/old/t.sh
+++ b/old/t.sh
@@ -4,7 +4,7 @@
 # 当前脚本版本号和新增功能
 VERSION=1.00
 
-declare -a T
+declare -a T >/dev/null 2>&1
 
 T[E0]="\n Language:\n  1.English (default) \n  2.简体中文\n"
 T[C0]="${T[E0]}"
@@ -160,7 +160,7 @@ net(){
 # WARP 开关，先检查是否已安装，再根据当前状态转向相反状态
 onoff(){ 
 	! type -P wg-quick >/dev/null 2>&1 && red " ${T[${L}21]} " && exit 1
-	[[ -n $(sudo wg 2>/dev/null) ]] && (wg-quick down wgcf >/dev/null 2>&1; green " ${T[${L}22]} ") || net
+	[[ -n $(sudo wg 2>/dev/null) ]] && (wg-quick down wgcf >/dev/null 2>&1; if [[ $L = E ]]; then green " ${T[E22]} "; else green " ${T[C22]} "; fi) || net
 }
 
 # 同步脚本至最新版本
@@ -168,7 +168,11 @@ ver(){
 	sudo wget -N -P /etc/wireguard https://raw.githubusercontents.com/fscarmen/warp/main/pc/mac.sh
 	chmod +x /etc/wireguard/mac.sh
 	sudo ln -sf /etc/wireguard/mac.sh /usr/local/bin/warp
-	green " ${T[${L}28]}:$(grep ^VERSION /etc/wireguard/mac.sh | sed "s/.*=//g")  ${T[${L}29]}：$(grep "T\[${L}1]" /etc/wireguard/menu.sh | cut -d \" -f2) " || red " ${T[${L}30]} "
+	if [[ $L = E ]]; then
+	green " ${T[E28]}:$(grep ^VERSION /etc/wireguard/mac.sh | sed "s/.*=//g")  ${T[E29]}：$(grep "T\[${L}1]" /etc/wireguard/menu.sh | cut -d \" -f2) " || red " ${T[E30]} "
+	else
+	green " ${T[C28]}:$(grep ^VERSION /etc/wireguard/mac.sh | sed "s/.*=//g")  ${T[C29]}：$(grep "T\[${L}1]" /etc/wireguard/menu.sh | cut -d \" -f2) " || red " ${T[C30]} "
+	fi
 	exit
 }
 
@@ -181,7 +185,11 @@ uninstall(){
 	# 显示卸载结果
 	ip4_info; [[ $L = C && -n "$COUNTRY4" ]] && COUNTRY4=$(translate "$COUNTRY4")
 	ip6_info; [[ $L = C && -n "$COUNTRY6" ]] && COUNTRY6=$(translate "$COUNTRY6")
-	green " ${T[${L}4]}\n IPv4：$WAN4 $COUNTRY4 $ASNORG4\n IPv6：$WAN6 $COUNTRY6 $ASNORG6 "
+	if [[ $L = E ]]; then
+	green " ${T[E4]}\n IPv4：$WAN4 $COUNTRY4 $ASNORG4\n IPv6：$WAN6 $COUNTRY6 $ASNORG6 "
+	else
+	green " ${T[C4]}\n IPv4：$WAN4 $COUNTRY4 $ASNORG4\n IPv6：$WAN6 $COUNTRY6 $ASNORG6 "
+	fi
 }
 
 install(){
@@ -210,9 +218,9 @@ install(){
 
 	# 判断 wgcf 的最新版本并安装
 	green " \n${T[${L}11]}\n "
-#	latest=$(curl -fsSL "https://api.github.com/repos/ViRb3/wgcf/releases/latest" | grep "tag_name" | head -n 1 | cut -d : -f2 | sed 's/[ \"v,]//g')
-#	latest=${latest:-'2.2.13'}
-	curl -m8 -o /usr/local/bin/wgcf https://raw.githubusercontents.com/fscarmen/warp/main/wgcf/wgcf_2.2.13_darwin_amd64
+	latest=$(curl -fsSL "https://api.github.com/repos/ViRb3/wgcf/releases/latest" | grep "tag_name" | head -n 1 | cut -d : -f2 | sed 's/[ \"v,]//g')
+	latest=${latest:-'2.2.13'}
+	curl -m8 -o /usr/local/bin/wgcf https://raw.githubusercontents.com/fscarmen/warp/main/wgcf/wgcf_"$lates"_darwin_amd64
 
 	# 安装 wireguard-go
 	curl -o /usr/local/bin/wireguard-go_darwin_amd64.tar.gz https://raw.githubusercontents.com/fscarmen/warp/main/wireguard-go/wireguard-go_darwin_amd64.tar.gz &&
@@ -242,7 +250,7 @@ install(){
 	sudo cp -f wgcf-profile.conf /etc/wireguard/wgcf.conf
 	sudo cp -f /usr/local/bin/t.sh /etc/wireguard/mac.sh
 	ln -sf /etc/wireguard/mac.sh /usr/local/bin/warp && green " ${T[${L}27]} " && chmod +x /usr/local/bin/warp
-	sudo echo "$L" >/etc/wireguard/language
+	echo "$L" 2>&1 | sudo tee /etc/wireguard/language
 
 	# 自动刷直至成功（ warp bug，有时候获取不了ip地址）
 	green " \n${T[${L}12]}\n "
@@ -269,6 +277,7 @@ install(){
 [[ $1 != '[option]' ]] && OPTION=$(tr '[:upper:]' '[:lower:]' <<< "$1")
 
 statistics_of_run-times
+select_language
 
 case "$OPTION" in
 e ) L=E; check_operating_system; install;;