Skip to content

Commit 61a41ff

Browse files
committed
fix api fail and test run
1 parent 21b5732 commit 61a41ff

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

src/core.sh

+4-3
Original file line numberDiff line numberDiff line change
@@ -823,6 +823,7 @@ api() {
823823
[[ ! $1 ]] && err "无法识别 API 的参数."
824824
[[ $is_core_stop ]] && {
825825
warn "$is_core_name 当前处于停止状态."
826+
is_api_fail=1
826827
return
827828
}
828829
case $1 in
@@ -1239,7 +1240,7 @@ get() {
12391240
dokodemo-door*)
12401241
is_protocol=dokodemo-door
12411242
net=door
1242-
json_str='settings:{port:'\"$door_port\"',address:'\"$door_addr\"',network:"tcp,udp"}'
1243+
json_str='settings:{port:'"$door_port"',address:'\"$door_addr\"',network:"tcp,udp"}'
12431244
;;
12441245
*http*)
12451246
is_protocol=http
@@ -1388,7 +1389,7 @@ get() {
13881389
return
13891390
}
13901391
is_no_manage_msg=1
1391-
if [[ $is_core_stop ]]; then
1392+
if [[ ! $(pgrep -f $is_core_bin) ]]; then
13921393
_yellow "\n测试运行 $is_core_name ..\n"
13931394
manage start &>/dev/null
13941395
if [[ $is_run_fail == $is_core ]]; then
@@ -1401,7 +1402,7 @@ get() {
14011402
_green "\n$is_core_name 正在运行, 跳过测试\n"
14021403
fi
14031404
if [[ $is_caddy ]]; then
1404-
if [[ $is_caddy_stop ]]; then
1405+
if [[ ! $(pgrep -f $is_caddy_bin) ]]; then
14051406
_yellow "\n测试运行 Caddy ..\n"
14061407
manage start caddy &>/dev/null
14071408
if [[ $is_run_fail == 'caddy' ]]; then

src/help.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ about() {
7979
####### 要点13脸吗只会改我链接的小人 #######
8080
unset c n m s b
8181
msg
82-
msg "Blog: $(msg_ul https://233boy.com)"
83-
msg "Chat: $(msg_ul https://t.me/tg233boy)"
84-
msg "Chanel: $(msg_ul https://t.me/tg2333)"
82+
msg "网站: $(msg_ul https://233boy.com)"
83+
msg "频道: $(msg_ul https://t.me/tg2333)"
84+
msg "群组: $(msg_ul https://t.me/tg233boy)"
8585
msg "Github: $(msg_ul https://github.com/${is_sh_repo})"
8686
msg "Twitter: $(msg_ul https://twitter.com/ai233boy)"
8787
msg "$is_core_name site: $(msg_ul https://xtls.github.io)"

xray.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

33
args=$@
4-
is_sh_ver=v1.06
4+
is_sh_ver=v1.07
55

66
. /etc/xray/sh/src/init.sh

0 commit comments

Comments
 (0)