diff --git a/menu.sh b/menu.sh index 92905fa..e7e1f1f 100644 --- a/menu.sh +++ b/menu.sh @@ -823,7 +823,7 @@ proxy_onoff(){ ACCOUNT=$(warp-cli --accept-tos account 2>/dev/null) [[ $ACCOUNT =~ 'Limited' ]] && AC='+' && CHECK_TYPE=1 && check_quota [[ $(ss -nltp) =~ 'warp-svc' ]] && green " ${T[${L}90]}\n $(eval echo "${T[${L}27]}") " - [[ -n "$QUOTA" ]] && green " ${T[${L}63]}:$QUOTA " + [[ -n "$QUOTA" ]] && green " ${T[${L}63]}: $QUOTA " exit 0 else INTERFACE='--interface CloudflareWARP' @@ -833,7 +833,7 @@ proxy_onoff(){ ACCOUNT=$(warp-cli --accept-tos account 2>/dev/null) [[ $ACCOUNT =~ 'Limited' ]] && AC='+' && CHECK_TYPE=1 && check_quota [[ $(ip a) =~ 'CloudflareWARP' ]] && green " ${T[${L}90]}\n $(eval echo "${T[${L}169]}") " - [[ -n "$QUOTA" ]] && green " ${T[${L}63]}:$QUOTA " + [[ -n "$QUOTA" ]] && green " ${T[${L}63]}: $QUOTA " exit 0 fi fi @@ -1636,7 +1636,7 @@ proxy(){ red "\n==============================================================\n" green " $(eval echo "${T[${L}94]}")\n $(eval echo "${T[${L}27]}") " fi - [[ $ACCOUNT =~ 'Limited' ]] && green " ${T[${L}63]}:$QUOTA " + [[ $ACCOUNT =~ 'Limited' ]] && green " ${T[${L}63]}: $QUOTA " red "\n==============================================================\n" yellow " ${T[${L}43]}\n " && help } @@ -1707,7 +1707,7 @@ update(){ net [[ $(curl -ks4 https://www.cloudflare.com/cdn-cgi/trace | grep warp | sed "s/warp=//g") = plus || $(curl -ks6 https://www.cloudflare.com/cdn-cgi/trace | grep warp | sed "s/warp=//g") = plus ]] && check_quota && - green " ${T[${L}62]}\n ${T[${L}25]}:$(grep 'Device name' /etc/wireguard/info.log | awk '{ print $NF }')\n ${T[${L}63]}:$QUOTA " ) || red " ${T[${L}36]} ";; + green " ${T[${L}62]}\n ${T[${L}25]}:$(grep 'Device name' /etc/wireguard/info.log | awk '{ print $NF }')\n ${T[${L}63]}: $QUOTA " ) || red " ${T[${L}36]} ";; 2 ) input_url [[ $CONFIRM = [Yy] ]] && (echo "$TEAMS" > /etc/wireguard/info.log 2>&1 @@ -1729,7 +1729,7 @@ update(){ if [[ $ACCOUNT =~ 'Limited' ]]; then echo "$LICENSE" >/etc/wireguard/license CHECK_TYPE=1 && check_quota - green " ${T[${L}62]}\n ${T[${L}63]}:$QUOTA " + green " ${T[${L}62]}\n ${T[${L}63]}: $QUOTA " else red " ${T[${L}36]} " fi @@ -1751,7 +1751,8 @@ update(){ sed -i "s#PrivateKey.*#PrivateKey = $(grep "PrivateKey.*" /etc/wireguard/wgcf.conf | sed "s#PrivateKey = ##g")#g" proxy.conf systemctl restart wireproxy [[ $(eval echo "\$(curl -sx socks5h://localhost:$(ss -nltp | grep wireproxy | grep -oP '127.0*\S+' | cut -d: -f2) https://www.cloudflare.com/cdn-cgi/trace)") =~ plus ]] && - green " ${T[${L}62]}\n ${T[${L}25]}:$(grep 'Device name' /etc/wireguard/info.log | awk '{ print $NF }')\n ${T[${L}63]}:$(grep Quota /etc/wireguard/info.log | awk '{ print $(NF-1), $NF }')" ) || red " ${T[${L}36]} ";; + check_quota && + green " ${T[${L}62]}\n ${T[${L}25]}:$(grep 'Device name' /etc/wireguard/info.log | awk '{ print $NF }')\n ${T[${L}63]}: $QUOTA " ) || red " ${T[${L}36]} ";; 2 ) input_url [[ $CONFIRM = [Yy] ]] && (echo "$TEAMS" > /etc/wireguard/info.log 2>&1 @@ -1847,7 +1848,7 @@ menu(){ [[ $WIREPROXY = 0 ]] && green " ${T[${L}160]} " [[ $WIREPROXY = 2 ]] && green " ${T[${L}161]} " [[ $WIREPROXY = 3 ]] && green " WARP$AC2 ${T[${L}159]} $(eval echo "${T[${L}162]}") " - grep -q '+' <<< $AC$AC2 && green " ${T[${L}63]}:$QUOTA " + grep -q '+' <<< $AC$AC2 && green " ${T[${L}63]}: $QUOTA " red "\n======================================================================================================================\n" green " 1. $OPTION1\n 2. $OPTION2\n 3. $OPTION3\n 4. $OPTION4\n 5. $OPTION5\n 6. $OPTION6\n 7. $OPTION7\n 8. $OPTION8\n 9. $OPTION9 \n 10. $OPTION10\n 11. $OPTION11\n 12. $OPTION12\n 13. $OPTION13\n 14. $OPTION14\n 0. $OPTION0\n " reading " ${T[${L}50]} " CHOOSE1