From b0207515a0182c8aeb57280563a34574c7e51392 Mon Sep 17 00:00:00 2001
From: 233boy <31657650+233boy@users.noreply.github.com>
Date: Sat, 27 May 2023 08:07:12 +0800
Subject: [PATCH] fix api fail and test run

---
 src/core.sh | 7 ++++---
 src/help.sh | 6 +++---
 v2ray.sh    | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/core.sh b/src/core.sh
index 322531c5e..c40320f54 100644
--- a/src/core.sh
+++ b/src/core.sh
@@ -828,6 +828,7 @@ api() {
     [[ ! $1 ]] && err "无法识别 API 的参数."
     [[ $is_core_stop ]] && {
         warn "$is_core_name 当前处于停止状态."
+        is_api_fail=1
         return
     }
     case $1 in
@@ -1244,7 +1245,7 @@ get() {
         dokodemo-door*)
             is_protocol=dokodemo-door
             net=door
-            json_str='settings:{port:'\"$door_port\"',address:'\"$door_addr\"',network:"tcp,udp"}'
+            json_str='settings:{port:'"$door_port"',address:'\"$door_addr\"',network:"tcp,udp"}'
             ;;
         *http*)
             is_protocol=http
@@ -1393,7 +1394,7 @@ get() {
             return
         }
         is_no_manage_msg=1
-        if [[ $is_core_stop ]]; then
+        if [[ ! $(pgrep -f $is_core_bin) ]]; then
             _yellow "\n测试运行 $is_core_name ..\n"
             manage start &>/dev/null
             if [[ $is_run_fail == $is_core ]]; then
@@ -1406,7 +1407,7 @@ get() {
             _green "\n$is_core_name 正在运行, 跳过测试\n"
         fi
         if [[ $is_caddy ]]; then
-            if [[ $is_caddy_stop ]]; then
+            if [[ ! $(pgrep -f $is_caddy_bin) ]]; then
                 _yellow "\n测试运行 Caddy ..\n"
                 manage start caddy &>/dev/null
                 if [[ $is_run_fail == 'caddy' ]]; then
diff --git a/src/help.sh b/src/help.sh
index bcaa7b965..aec89b0f4 100644
--- a/src/help.sh
+++ b/src/help.sh
@@ -79,9 +79,9 @@ about() {
     ####### 要点13脸吗只会改我链接的小人 #######
     unset c n m s b
     msg
-    msg "Blog: $(msg_ul https://233boy.com)"
-    msg "Chat: $(msg_ul https://t.me/tg233boy)"
-    msg "Chanel: $(msg_ul https://t.me/tg2333)"
+    msg "网站: $(msg_ul https://233boy.com)"
+    msg "频道: $(msg_ul https://t.me/tg2333)"
+    msg "群组: $(msg_ul https://t.me/tg233boy)"
     msg "Github: $(msg_ul https://github.com/${is_sh_repo})"
     msg "Twitter: $(msg_ul https://twitter.com/ai233boy)"
     msg "$is_core_name site: $(msg_ul https://www.v2fly.org)"
diff --git a/v2ray.sh b/v2ray.sh
index 77c89907e..2e452f4c9 100644
--- a/v2ray.sh
+++ b/v2ray.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
 args=$@
-is_sh_ver=v4.06
+is_sh_ver=v4.07
 
 . /etc/v2ray/sh/src/init.sh