Skip to content

Commit

Permalink
fix api fail and test run
Browse files Browse the repository at this point in the history
  • Loading branch information
233boy committed May 27, 2023
1 parent bf8867c commit b020751
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
7 changes: 4 additions & 3 deletions src/core.sh
Original file line number Diff line number Diff line change
Expand Up @@ -828,6 +828,7 @@ api() {
[[ ! $1 ]] && err "无法识别 API 的参数."
[[ $is_core_stop ]] && {
warn "$is_core_name 当前处于停止状态."
is_api_fail=1
return
}
case $1 in
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/help.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down
2 changes: 1 addition & 1 deletion v2ray.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

args=$@
is_sh_ver=v4.06
is_sh_ver=v4.07

. /etc/v2ray/sh/src/init.sh

0 comments on commit b020751

Please sign in to comment.