Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
86bb946091 | ||
![]() |
7270c1a16d |
@@ -198,6 +198,7 @@ check_status() {
|
||||
# dependent pkg install fail
|
||||
[[ ! -f $is_pkg_ok ]] && {
|
||||
msg err "安装依赖包失败"
|
||||
msg err "请尝试手动安装依赖包: $cmd update -y; $cmd install -y $pkg"
|
||||
is_fail=1
|
||||
}
|
||||
|
||||
|
@@ -124,7 +124,7 @@ get_uuid() {
|
||||
}
|
||||
|
||||
get_ip() {
|
||||
[[ $ip || $is_no_auto_tls || $is_gen ]] && return
|
||||
[[ $ip || $is_no_auto_tls || $is_gen || $is_dont_get_ip ]] && return
|
||||
export "$(_wget -4 -qO- https://one.one.one.one/cdn-cgi/trace | grep ip=)" &>/dev/null
|
||||
[[ ! $ip ]] && export "$(_wget -6 -qO- https://one.one.one.one/cdn-cgi/trace | grep ip=)" &>/dev/null
|
||||
[[ ! $ip ]] && {
|
||||
@@ -732,6 +732,8 @@ change() {
|
||||
|
||||
# delete config.
|
||||
del() {
|
||||
# dont get ip
|
||||
is_dont_get_ip=1
|
||||
[[ $is_conf_dir_empty ]] && return # not found any json file.
|
||||
# get a config file
|
||||
[[ ! $is_config_file ]] && get info $1
|
||||
@@ -761,6 +763,7 @@ del() {
|
||||
warn "当前配置目录为空! 因为你刚刚删除了最后一个配置文件."
|
||||
is_conf_dir_empty=1
|
||||
fi
|
||||
unset is_dont_get_ip
|
||||
[[ $is_dont_auto_exit ]] && unset is_config_file
|
||||
}
|
||||
|
||||
@@ -1303,7 +1306,7 @@ get() {
|
||||
net=socks
|
||||
[[ ! $is_socks_user ]] && is_socks_user=233boy
|
||||
[[ ! $is_socks_pass ]] && is_socks_pass=$uuid
|
||||
json_str='settings:{auth:"password",accounts:[{user:'\"$is_socks_user\"',pass:'\"$is_socks_pass\"'}],udp:true}'
|
||||
json_str='settings:{auth:"password",accounts:[{user:'\"$is_socks_user\"',pass:'\"$is_socks_pass\"'}],udp:true,ip:"0.0.0.0"}'
|
||||
;;
|
||||
*)
|
||||
err "无法识别协议: $is_config_file"
|
||||
|
Reference in New Issue
Block a user