From 62070303a8c4976af0e8a548e568f167be884690 Mon Sep 17 00:00:00 2001
From: fscarmen <62703343+fscarmen@users.noreply.github.com>
Date: Mon, 3 Oct 2022 22:18:05 +0800
Subject: [PATCH] Update warp-go.sh

---
 warp-go.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/warp-go.sh b/warp-go.sh
index d07a708..da949a4 100644
--- a/warp-go.sh
+++ b/warp-go.sh
@@ -599,7 +599,7 @@ stack_switch() {
     esac
   fi
 
-  [[ "${#TO}" != [34] ]] && error " $(text 10) " || sh -c "$(eval echo "\$SWITCH$TO")"
+  [ "${#TO}" != 3 ] && error " $(text 10) " || sh -c "$(eval echo "\$SWITCH$TO")"
   ${SYSTEMCTL_RESTART[int]}
   grep -q "^AllowedIPs.*0\.\0\/0" /opt/warp-go/warp.conf || unset INTERFACE
   OPTION=o && net
@@ -812,9 +812,12 @@ export_wireguard() {
 
 # warp-go 安装
 install() {
-  # 已经状态码不为 0 ，即已安装，脚本退出
+  # 已经状态码不为 0， 即已安装， 脚本退出
   [[ $STATUS != 0 ]] && error "$(text 53)"
 
+  # CONF 参数如果不是3位或4位， 即检测不出正确的配置参数， 脚本退出
+  [[ "${#CONF}" != [34] ]] && error " $(text 10) "
+
   # 先删除之前安装，可能导致失败的文件
   rm -rf /opt/warp-go/warp-go /opt/warp-go/warp.conf
 
@@ -958,7 +961,7 @@ EOF
   MODIFY11N6='sed -i "/Endpoint6/d;/PreUp/d;s/162.159.*/[2606:4700:d0::a29f:c003]:2408/g;s#.*AllowedIPs.*#AllowedIPs = ::/0#g;s#.*PostUp.*#PostUp = ip -4 rule add from '$LAN4' lookup main; ip -6 rule add from '$LAN6' lookup main#g;s#.*PostDown.*#PostDown = ip -4 rule delete from '$LAN4' lookup main; ip -6 rule delete from '$LAN6' lookup main\n\#PostUp = /opt/warp-go/NonGlobalUp.sh\n\#PostDown = /opt/warp-go/NonGlobalDown.sh#g" /opt/warp-go/warp.conf'
   MODIFY11ND='sed -i "/Endpoint6/d;/PreUp/d;s/162.159.*/[2606:4700:d0::a29f:c003]:2408/g;s#.*AllowedIPs.*#AllowedIPs = 0.0.0.0/0,::/0#g;s#.*PostUp.*#PostUp = ip -4 rule add from '$LAN4' lookup main; ip -6 rule add from '$LAN6' lookup main#g;s#.*PostDown.*#PostDown = ip -4 rule delete from '$LAN4' lookup main; ip -6 rule delete from '$LAN6' lookup main\n\#PostUp = /opt/warp-go/NonGlobalUp.sh\n\#PostDown = /opt/warp-go/NonGlobalDown.sh#g" /opt/warp-go/warp.conf'
 
-  [[ "${#CONF}" != [34] ]] && error " $(text 10) " || sh -c "$(eval echo "\$MODIFY$CONF")"
+  sh -c "$(eval echo "\$MODIFY$CONF")"
 
   # 如为 WARP IPv4 非全局，修改配置文件，在路由表插入规则
   [[ $WARP_STACK = 4 || $OPTION = n ]] && STATUS=3 && global_switch