From 596efd56597ca63973dd1a0d3d03b13bac356fbc Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Mon, 10 Jun 2024 15:38:31 +0800 Subject: [PATCH] add doc tips --- sing-box.sh | 2 +- src/core.sh | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sing-box.sh b/sing-box.sh index 252b01d..f5c6aab 100644 --- a/sing-box.sh +++ b/sing-box.sh @@ -1,6 +1,6 @@ #!/bin/bash args=$@ -is_sh_ver=v1.02 +is_sh_ver=v1.03 . /etc/sing-box/sh/src/init.sh \ No newline at end of file diff --git a/src/core.sh b/src/core.sh index 8ba7ef1..9a57c24 100644 --- a/src/core.sh +++ b/src/core.sh @@ -923,7 +923,7 @@ add() { fi if [[ $is_use_tls ]]; then - if [[ ! $is_no_auto_tls && ! $is_caddy && ! $is_gen ]]; then + if [[ ! $is_no_auto_tls && ! $is_caddy && ! $is_gen && ! $is_dont_test_host ]]; then # test auto tls [[ $(is_test port_used 80) || $(is_test port_used 443) ]] && { get_port @@ -1066,9 +1066,9 @@ get() { is_config_name=$is_config_file if [[ $is_caddy && $host && -f $is_caddy_conf/$host.conf ]]; then - tmp_tlsport=$(egrep -o "$host:[1-9][0-9]?+" $is_caddy_conf/$host.conf | sed s/.*://) + is_tmp_https_port=$(egrep -o "$host:[1-9][0-9]?+" $is_caddy_conf/$host.conf | sed s/.*://) fi - [[ $tmp_tlsport ]] && is_https_port=$tmp_tlsport + [[ $is_tmp_https_port ]] && is_https_port=$is_tmp_https_port [[ $is_client && $host ]] && port=$is_https_port get protocol $is_protocol-$net_type fi @@ -1366,6 +1366,9 @@ info() { fi msg "$a $tt= \e[${is_color}m${is_info_str[$i]}\e[0m" done + if [[ $is_new_install ]]; then + warn "首次安装请查看脚本帮助文档: $(msg_ul https://233boy.com/$is_core/$is_core-script/)" + fi if [[ $is_url ]]; then msg "------------- ${info_list[12]} -------------" msg "\e[4;${is_color}m${is_url}\e[0m"