From 798d43ac4741a0e77b1e64f90576d85449dd5e99 Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Thu, 5 Dec 2024 20:29:02 +0800 Subject: [PATCH] del config dont get ip --- install.sh | 1 + sing-box.sh | 2 +- src/core.sh | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 23ba805..7903664 100644 --- a/install.sh +++ b/install.sh @@ -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 } diff --git a/sing-box.sh b/sing-box.sh index eb7769a..0f04d16 100644 --- a/sing-box.sh +++ b/sing-box.sh @@ -1,6 +1,6 @@ #!/bin/bash args=$@ -is_sh_ver=v1.04 +is_sh_ver=v1.05 . /etc/sing-box/sh/src/init.sh \ No newline at end of file diff --git a/src/core.sh b/src/core.sh index 5ea9f83..515bd3e 100644 --- a/src/core.sh +++ b/src/core.sh @@ -116,7 +116,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 ]] && { @@ -635,6 +635,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 @@ -663,6 +665,7 @@ del() { warn "当前配置目录为空! 因为你刚刚删除了最后一个配置文件." is_conf_dir_empty=1 fi + unset is_dont_get_ip [[ $is_dont_auto_exit ]] && unset is_config_file }