Skip to content

Commit 596efd5

Browse files
committed
add doc tips
1 parent 3d942cf commit 596efd5

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

sing-box.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.02
4+
is_sh_ver=v1.03
55

66
. /etc/sing-box/sh/src/init.sh

src/core.sh

+6-3
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,7 @@ add() {
923923
fi
924924

925925
if [[ $is_use_tls ]]; then
926-
if [[ ! $is_no_auto_tls && ! $is_caddy && ! $is_gen ]]; then
926+
if [[ ! $is_no_auto_tls && ! $is_caddy && ! $is_gen && ! $is_dont_test_host ]]; then
927927
# test auto tls
928928
[[ $(is_test port_used 80) || $(is_test port_used 443) ]] && {
929929
get_port
@@ -1066,9 +1066,9 @@ get() {
10661066
is_config_name=$is_config_file
10671067
10681068
if [[ $is_caddy && $host && -f $is_caddy_conf/$host.conf ]]; then
1069-
tmp_tlsport=$(egrep -o "$host:[1-9][0-9]?+" $is_caddy_conf/$host.conf | sed s/.*://)
1069+
is_tmp_https_port=$(egrep -o "$host:[1-9][0-9]?+" $is_caddy_conf/$host.conf | sed s/.*://)
10701070
fi
1071-
[[ $tmp_tlsport ]] && is_https_port=$tmp_tlsport
1071+
[[ $is_tmp_https_port ]] && is_https_port=$is_tmp_https_port
10721072
[[ $is_client && $host ]] && port=$is_https_port
10731073
get protocol $is_protocol-$net_type
10741074
fi
@@ -1366,6 +1366,9 @@ info() {
13661366
fi
13671367
msg "$a $tt= \e[${is_color}m${is_info_str[$i]}\e[0m"
13681368
done
1369+
if [[ $is_new_install ]]; then
1370+
warn "首次安装请查看脚本帮助文档: $(msg_ul https://233boy.com/$is_core/$is_core-script/)"
1371+
fi
13691372
if [[ $is_url ]]; then
13701373
msg "------------- ${info_list[12]} -------------"
13711374
msg "\e[4;${is_color}m${is_url}\e[0m"

0 commit comments

Comments
 (0)