From 86bb94609105c38457719a2d45b6e7e7b0ce0050 Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Thu, 5 Dec 2024 20:29:00 +0800 Subject: [PATCH] del config dont get ip --- install.sh | 1 + src/core.sh | 5 ++++- v2ray.sh | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index b5672be4d..56482e948 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/src/core.sh b/src/core.sh index b82642b26..487c04cbb 100644 --- a/src/core.sh +++ b/src/core.sh @@ -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 } diff --git a/v2ray.sh b/v2ray.sh index dd086ff62..b0313be9d 100644 --- a/v2ray.sh +++ b/v2ray.sh @@ -1,6 +1,6 @@ #!/bin/bash args=$@ -is_sh_ver=v4.22 +is_sh_ver=v4.23 . /etc/v2ray/sh/src/init.sh