svefnz/sing-box
1
0
Fork 0
Code Issues Pull Requests Actions 21 Packages Projects Releases Wiki Activity

fix test run

Browse Source
This commit is contained in:
233boy
2026-06-04 14:27:04 +08:00
parent 4376b9a907
commit 2d78583b5a
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sing-box.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
args=$@ args=$@
is_sh_ver=v1.17 is_sh_ver=v1.18
. /etc/sing-box/sh/src/init.sh . /etc/sing-box/sh/src/init.sh
src/core.sh
+3 -3
View File
@@ -771,7 +771,7 @@ manage() {
fi fi
[[ $is_test_run && ! $is_new_install ]] && { [[ $is_test_run && ! $is_new_install ]] && {
sleep 2 sleep 2
if [[ ! $(pgrep -f $is_run_bin 2>/dev/null || grep -l "$is_run_bin" /proc/*/cmdline 2>/dev/null) ]]; then if [[ ! $(pgrep -f $is_run_bin) ]]; then
is_run_fail=${is_do_name_msg,,} is_run_fail=${is_do_name_msg,,}
[[ ! $is_no_manage_msg ]] && { [[ ! $is_no_manage_msg ]] && {
msg msg
@@ -1324,7 +1324,7 @@ get() {
} }
fi fi
is_no_manage_msg=1 is_no_manage_msg=1
if [[ ! $(pgrep -f $is_core_bin 2>/dev/null || grep -l "$is_core_bin" /proc/*/cmdline 2>/dev/null) ]]; then if [[ ! $(pgrep -f $is_core_bin) ]]; then
_yellow "\n测试运行 $is_core_name ..\n" _yellow "\n测试运行 $is_core_name ..\n"
manage start &>/dev/null manage start &>/dev/null
if [[ $is_run_fail == $is_core ]]; then if [[ $is_run_fail == $is_core ]]; then
@@ -1337,7 +1337,7 @@ get() {
_green "\n$is_core_name 正在运行, 跳过测试\n" _green "\n$is_core_name 正在运行, 跳过测试\n"
fi fi
if [[ $is_caddy ]]; then if [[ $is_caddy ]]; then
if [[ ! $(pgrep -f $is_caddy_bin 2>/dev/null || grep -l "$is_caddy_bin" /proc/*/cmdline 2>/dev/null) ]]; then if [[ ! $(pgrep -f $is_caddy_bin) ]]; then
_yellow "\n测试运行 Caddy ..\n" _yellow "\n测试运行 Caddy ..\n"
manage start caddy &>/dev/null manage start caddy &>/dev/null
if [[ $is_run_fail == 'caddy' ]]; then if [[ $is_run_fail == 'caddy' ]]; then
src/init.sh
+2 -2
View File
@@ -115,7 +115,7 @@ is_tls_key=$is_core_dir/bin/tls.key
rm $is_tls_tmp rm $is_tls_tmp
} }
if [[ $(pgrep -f $is_core_bin 2>/dev/null || grep -l "$is_core_bin" /proc/*/cmdline 2>/dev/null) ]]; then if [[ $(pgrep -f $is_core_bin) ]]; then
is_core_status=$(_green running) is_core_status=$(_green running)
else else
is_core_status=$(_red_bg stopped) is_core_status=$(_red_bg stopped)
@@ -135,7 +135,7 @@ if [[ -f $is_caddy_bin && -d $is_caddy_dir && $is_caddy_service ]]; then
is_tmp_https_port=$(grep -E '^ {2,}https_port|^https_port' $is_caddyfile | grep -E -o [0-9]+) is_tmp_https_port=$(grep -E '^ {2,}https_port|^https_port' $is_caddyfile | grep -E -o [0-9]+)
[[ $is_tmp_http_port ]] && is_http_port=$is_tmp_http_port [[ $is_tmp_http_port ]] && is_http_port=$is_tmp_http_port
[[ $is_tmp_https_port ]] && is_https_port=$is_tmp_https_port [[ $is_tmp_https_port ]] && is_https_port=$is_tmp_https_port
if [[ $(pgrep -f $is_caddy_bin 2>/dev/null || grep -l "$is_caddy_bin" /proc/*/cmdline 2>/dev/null) ]]; then if [[ $(pgrep -f $is_caddy_bin) ]]; then
is_caddy_status=$(_green running) is_caddy_status=$(_green running)
else else
is_caddy_status=$(_red_bg stopped) is_caddy_status=$(_red_bg stopped)